From patchwork Thu Oct 19 01:28:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54987 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 03D7527BBE2; Wed, 18 Oct 2023 23:32:08 +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 6E6AD27BBEA for ; Wed, 18 Oct 2023 23:32:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3m-0003nB-Uv; Wed, 18 Oct 2023 18:30: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 1qtF3k-0003kQ-Fi for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:36 -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 1qtF3k-00034q-7G for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4A-00027z-D2 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 01/19] gnu: Add (gnu packages golang-check) module. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682244701 (code B ref 66619); Wed, 18 Oct 2023 22:31:02 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:24 +0000 Received: from localhost ([127.0.0.1]:34910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3X-0001Cu-W1 for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:24 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:46141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3T-0000kr-Bk for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:20 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-405497850dbso68653155e9.0 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668187; x=1698272987; 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=/ZWAJHX6wbvE4lpkSvdAGspz6pRrWMSiLUOy/4wtjuU=; b=QtEJj5KfaDC/qt+M69vPMlQ8ib9hn0BwFN56Iohy54Oy1e/Kl7gsKc02cmeLD1B54E eG+Z8TPOc1YZxLw1EJ+fmCwVuhM2ZF2Mg4CwX/5qg28K6wtG40zzAiKWcWUJP6ZdmkMU zaC2ugQXymPO4R3nWxc/LNNrrPX5INOy6ZqShElKPSsoBdgzTFkD4m43DV0ptXulN62u k7Hj/uaEoXNKCA5VZeHqp2s8yKZVyUh4Ya6Qji3P31n//Z7gKw/3B94LQig4VRxzWuY3 m+NMxBU1g13A7g9HdhJNj2pJEowBXcEe2365s+FplAivR+HfyeDqyvGwscSJa+P1rXdf dDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668187; x=1698272987; 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=/ZWAJHX6wbvE4lpkSvdAGspz6pRrWMSiLUOy/4wtjuU=; b=XcjRFDkVJc17hOyL54JM7mCTAmxv75qgbAFojlNEowYF3COe8Then5G14VElr73Wak mjdpjxVlxrZYJ+eHMfHyPRyV6yxAgFHpau7JQWwMjsxGMuBoYUeRqbERRdtPT+Srqglk mSgMi182DsRTn2JEAJM20z6glrbM0ja19p9sX55uZZmCiCQJ+oJHL3VltULBhShGVAvh +x8hqT5+x3aehQ6um6Fv2JPR3TcfE3rjs6MMoKAD9DClhTkgA/e1Ki4EAALieBY6KBJi fX1HREc3QTQWH/O1V9O5raXSVohgiAiIOlyPNihfZPt7sRxlmt66PQLIEYqPnI1r2CZF Nuow== X-Gm-Message-State: AOJu0Yx8nPsllBsLeb6UZzPsMjSzJhxmPC1VrDFgg5oCjhVtEAPuyoAg tepyTBlqPOB+E7q7iKUY3V5kDqRM04YWmw== X-Google-Smtp-Source: AGHT+IHqxtWD5KSVWv07NghKp4tkbzLxPSdGl7H1VcD9DMO9tJdVCkxNyohvEWUr+Fc7B6Nia3vwXA== X-Received: by 2002:a5d:6a0a:0:b0:32d:a430:beb with SMTP id m10-20020a5d6a0a000000b0032da4300bebmr266825wru.39.1697668187307; Wed, 18 Oct 2023 15:29:47 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:46 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:54 +0100 Message-ID: <1d1d15118cabce4efe4e06602daf39b5ed7a046e.1697678664.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: New file. * gnu/local.mk: Add to gnu/packages/golang-check.scm scope. --- gnu/local.mk | 1 + gnu/packages/golang-check.scm | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 gnu/packages/golang-check.scm diff --git a/gnu/local.mk b/gnu/local.mk index daacd786a7..5f50801073 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -302,6 +302,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gnu-pw-mgr.scm \ %D%/packages/gobby.scm \ %D%/packages/golang.scm \ + %D%/packages/golang-check.scm \ %D%/packages/gperf.scm \ %D%/packages/gpodder.scm \ %D%/packages/gps.scm \ diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm new file mode 100644 index 0000000000..160fdff6a6 --- /dev/null +++ b/gnu/packages/golang-check.scm @@ -0,0 +1,38 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages golang-check) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix build-system go) + #:use-module (guix git-download) + #:use-module (gnu packages) + #:use-module (gnu packages golang)) + +;;; Commentary: +;;; +;;; Golang packages to unit-test, mock, assert, lint processes for Golang itself. +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +;;; +;;; 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 +;;; functionality or similar names. +;;; From patchwork Thu Oct 19 01:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54991 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 0D93027BBEA; Wed, 18 Oct 2023 23:32:41 +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 AD22A27BBE2 for ; Wed, 18 Oct 2023 23:32:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3m-0003n9-Pc; Wed, 18 Oct 2023 18:30: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 1qtF3k-0003kZ-ST for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:36 -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 1qtF3k-000354-KD for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4A-000286-Q5; Wed, 18 Oct 2023 18:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 02/19] gnu: go-github-com-stretchr-testify: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682264831 (code B ref 66619); Wed, 18 Oct 2023 22:31:02 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:26 +0000 Received: from localhost ([127.0.0.1]:34912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3Y-0001Dk-H0 for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:25 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:46290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3U-0000pn-Os for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:22 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32d834ec222so6430255f8f.0 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668189; x=1698272989; 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=R52wEuBih/WlpsBNLEUuSutZTwfhAuG6mlSM5KoTKzc=; b=ZQjtGqVO415LgRpUh9/mczLf/PUQUjFsP4CW07++tOPrxkOJpjbVn0tt1GgfIWx2Yj a2DnamlM7antpnaw55fC7dE2Eo2Nnc4TSXZ+27VerdQhrN08bRm9hxayfKX119d8Ccdy daJ1yh0R/5Gi76Y+URJKy/CExy85kbGd8hdgvVTqyFHSMr6nWAAJOdXtHpPE0DgLbzY1 rGCUOjCHHuZ21VPGoJkADpEkyOZXb3BEAb5WNHaW0cgbApiRjwHUgWC02GInhG0ymf3J B+HR71f8s2loNbZQkjSbAekhu0CxMO6BYiTuaQ4DPUpGjxPddUqfF0gc3bm75/sYu38d CITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668189; x=1698272989; 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=R52wEuBih/WlpsBNLEUuSutZTwfhAuG6mlSM5KoTKzc=; b=UsERgHKYFEFrhjAQ8c35I+SXdLEQL5LhvvSjyFDJV2ecRmQB8itJ8ex8ndsfzFLo2C JczxGKKSEhA+HC1hNVhc4UKKNPurkOhbeXzhaG6M546yC70eIX9dJuUmzaxfbTVdCjLR F6ACKQtBzqALkTv0uzrwDZ6YCtd4N2NYCcbDMm63bg1ZT+JhVrTqQd6Xt8a0YtLBprxg u1iolNimu837CU7B32KsyCAIk3e6KdsLUfuDoDML9q6gTdvdgz4M+21fhIvBkORfPaQF R5M/klL5nw6HMh6K2zJBduLeUuhnDT5fFeZc9idRmx/LRMYc6wPHfKMZJDPU0iHf5L5o SBog== X-Gm-Message-State: AOJu0YzVHD8s3SIjZiI4nyTyOOWgOHC6PDpdUmLX9g0zDuMbJPFN0wHA rO1YLzmlXHN7wVSLkLzHdgs/pGg1fJje8Q== X-Google-Smtp-Source: AGHT+IH+xiu97PUeF683VYI4Kq1OgPRiYdqU77z8kMqq9bC26t8QX0bvYfDX391TThsS40s4miGAaw== X-Received: by 2002:a05:6000:b11:b0:321:6005:8979 with SMTP id dj17-20020a0560000b1100b0032160058979mr218554wrb.17.1697668188654; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:47 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:55 +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-stretchr-testify): Move from here... * gnu/packages/golang-check.scm: ...to here. * gnu/packages/databases.scm: Add (gnu packages golang-check) module. * gnu/packages/education.scm: As above... * gnu/packages/ipfs.scm: As above... * gnu/packages/irc.scm: As above... * gnu/packages/mail.scm: As above... * gnu/packages/textutils.scm: As above... * gnu/packages/version-control.scm: As above... --- gnu/packages/databases.scm | 1 + gnu/packages/education.scm | 1 + gnu/packages/golang-check.scm | 39 ++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 37 +----------------------------- gnu/packages/ipfs.scm | 1 + gnu/packages/irc.scm | 1 + gnu/packages/mail.scm | 1 + gnu/packages/textutils.scm | 1 + gnu/packages/version-control.scm | 1 + 9 files changed, 47 insertions(+), 36 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b5077583c3..e25b88941a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -106,6 +106,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 61fc9945fa..2fd1d4a632 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -47,6 +47,7 @@ (define-module (gnu packages education) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gtk) #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 160fdff6a6..c6b2f3f99e 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1,4 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +34,42 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-github-com-stretchr-testify + (package + (name "go-github-com-stretchr-testify") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stretchr/testify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/stretchr/testify")) + (propagated-inputs + `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) + ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib) + ("github.com/stretchr/objx" ,go-github-com-stretchr-objx) + ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3))) + (home-page "https://github.com/stretchr/testify") + (synopsis "Go helper library for tests and invariant checking") + (description "This package provide many tools for testifying that your +code will behave as you intend. + +Features include: +@itemize +@item Easy assertions +@item Mocking +@item HTTP response trapping +@item Testing suite interfaces and functions. +@end itemize") + (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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0277265375..9a7f60fc0a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -78,6 +78,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang-check) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -4588,42 +4589,6 @@ (define-public go-github-com-stretchr-objx slices, JSON and other data.") (license license:expat))) -(define-public go-github-com-stretchr-testify - (package - (name "go-github-com-stretchr-testify") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stretchr/testify") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/stretchr/testify")) - (propagated-inputs - `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) - ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib) - ("github.com/stretchr/objx" ,go-github-com-stretchr-objx) - ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3))) - (home-page "https://github.com/stretchr/testify") - (synopsis "Go helper library for tests and invariant checking") - (description "This package provide many tools for testifying that your -code will behave as you intend. - -Features include: -@itemize -@item Easy assertions -@item Mocking -@item HTTP response trapping -@item Testing suite interfaces and functions. -@end itemize") - (license license:expat))) - (define go-github-com-stretchr-testify-bootstrap (package (inherit go-github-com-stretchr-testify) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 1bad48de4c..ac12aea002 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -29,6 +29,7 @@ (define-module (gnu packages ipfs) #:use-module (guix download) #:use-module (guix build-system go) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages syncthing)) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 9d9e01a280..46961ccb7e 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -67,6 +67,7 @@ (define-module (gnu packages irc) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..709674bf59 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -108,6 +108,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) #:use-module (gnu packages gtk) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ddeb979334..41a34b6c4e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -63,6 +63,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 04b52f2a85..76fa8ef5d0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -104,6 +104,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) From patchwork Thu Oct 19 01:28:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54997 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 CB3EA27BBE9; Wed, 18 Oct 2023 23:33: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=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 0CB1027BBE2 for ; Wed, 18 Oct 2023 23:33:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3p-0003ob-8Q; Wed, 18 Oct 2023 18:30:41 -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 1qtF3l-0003kn-AM for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:37 -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 1qtF3l-00035A-1O for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4B-00028F-7W; Wed, 18 Oct 2023 18:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 03/19] gnu: go-github-com-jacobsa-oglemock: Move to (gnu packages golang-check) Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682274923 (code B ref 66619); Wed, 18 Oct 2023 22:31:03 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:27 +0000 Received: from localhost ([127.0.0.1]:34915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3Z-0001Fo-Q7 for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:26 -0400 Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]:54418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3W-0000vd-KC for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:23 -0400 Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2c54c8934abso10380831fa.0 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668190; x=1698272990; 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=LO0ObeOpbaeCutVF+R2mjv9helQYSBmEnm8moiaDr5k=; b=MEF17awbjg05Gx3UnuvYGE/gMBr4N0I9pABhTg1k4JfpeL2l+k6mX6BzByo/Wi/oPy YnCP+Sdqqpn0T/Vrbunf0Fe9zo7OdtDfybwxLlQHXfcKyz/wPrwvIlOtQUO2dgUD/XfU QifvFDPEj3nUPBLsU+FViFetRhH0tiA4p0yurt38IGFsq60+3qC8d+DnjLr8dYVYKP6/ me92PpD4tF1AhjqDYmcO/U3hf3uFXbqZCwXIn5Y31CLjDQnlmmYCcqOQTVDVQmPPxJXp Q4LTGoQxcg8rkGyOJsesuCSkQ0fPM9ewrTpSPieQWYu4Vk8/vt55UY9MhuhQTEqR/aS8 Ea+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668190; x=1698272990; 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=LO0ObeOpbaeCutVF+R2mjv9helQYSBmEnm8moiaDr5k=; b=PJeqVbhYd0FgzcqB1PKLw6S6fSF5K2ZVtJqLUhObN8yB8XOSovPEj3r7zoTtVTZhI+ 0aIbpkAk0WbL4fnjon9b1axRBJVFFTuQ04cdX9sHFq5kK5/Z6hBOU8OTKXmF2v/+L9O0 ml2fB7PuDdXCxdulZ5ogsLriB0u+pVMUvqFlz5ZAjYxgLjjNkMwu225eDJhSXrxow3Ez rvdO3WAJndOpKZNU7ugaKB07xvJDnhCQ3Gcxclp9tEgYvixIqzltNoIXb/w3Sn8CXxOZ J290WKHaFmFxgClvubLYr+5HFHzCDiEhjpMvtDsQw6tTtubBNJ5D+raNOg4DTJNBWO3A T6PQ== X-Gm-Message-State: AOJu0YxFjzlTTwdpon3aezVmdqQu3t9FHGTqhIQWXSBYu2BuXnUyF2Gx TNy/RwPQahA3Jg3PLAZO9mE6Ywd9/ZePbw== X-Google-Smtp-Source: AGHT+IHBt/dTjRosB9l3400zeeglKmbZZZ9de/qEtHNz3fzc5UHpy33qP+OR+qIukNkpHEDLsxZnIA== X-Received: by 2002:a2e:a0c6:0:b0:2c5:3090:537c with SMTP id f6-20020a2ea0c6000000b002c53090537cmr190791ljm.17.1697668190093; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:49 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:56 +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-jacobsa-oglemock): Move from here... * gnu/packages/golang-check.scm: ... to here. * gnu/packages/file-systems.scm: Add use-module (gnu-packages golang-check). --- gnu/packages/file-systems.scm | 1 + gnu/packages/golang-check.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 29 ----------------------------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 63de393851..bc061a5958 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -68,6 +68,7 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages guile) #:use-module (gnu packages jemalloc) #:use-module (gnu packages kerberos) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index c6b2f3f99e..7ca3cf5d64 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2023 Felix Lechner ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,36 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-github-com-jacobsa-oglemock + (let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf") + (revision "0")) + (package + (name "go-github-com-jacobsa-oglemock") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacobsa/oglemock") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14yxf8ykwdwkcccksl6741xgzcf8qykyi58kp4maxpgscqhdl8rq")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jacobsa/oglemock" + ;; break loop with with go-github-com-jacobsa-ogletest + #:tests? #f)) + (native-inputs + (list go-github-com-jacobsa-oglematchers)) + (home-page "https://github.com/jacobsa/oglemock") + (synopsis "Mocking framework for unit tests") + (description + "Package oglemock provides a mocking framework for unit tests.") + (license license:asl2.0)))) + (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9a7f60fc0a..05a68cdcc9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1339,35 +1339,6 @@ (define-public go-github-com-jacobsa-oglematchers Test for C++ and Google JS Test.") (license license:asl2.0)))) -(define-public go-github-com-jacobsa-oglemock - (let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf") - (revision "0")) - (package - (name "go-github-com-jacobsa-oglemock") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jacobsa/oglemock") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14yxf8ykwdwkcccksl6741xgzcf8qykyi58kp4maxpgscqhdl8rq")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/jacobsa/oglemock" - ;; break loop with with go-github-com-jacobsa-ogletest - #:tests? #f)) - (native-inputs (list - go-github-com-jacobsa-oglematchers)) - (home-page "https://github.com/jacobsa/oglemock") - (synopsis "Mocking framework for unit tests") - (description - "Package oglemock provides a mocking framework for unit tests.") - (license license:asl2.0)))) - (define-public go-github-com-jacobsa-ogletest (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292") (revision "0")) From patchwork Thu Oct 19 01:28:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54993 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 1B31827BBEA; Wed, 18 Oct 2023 23:32:45 +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 5FEB227BBE2 for ; Wed, 18 Oct 2023 23:32:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3o-0003o4-7F; Wed, 18 Oct 2023 18:30:40 -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 1qtF3l-0003mp-V2 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:37 -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 1qtF3l-00035O-L6 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4B-00028X-OI for guix-patches@gnu.org; Wed, 18 Oct 2023 18:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 04/19] gnu: go-github-com-stretchr-testify: Remove lables. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682366029 (code B ref 66619); Wed, 18 Oct 2023 22:31:03 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:36 +0000 Received: from localhost ([127.0.0.1]:34925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3k-0001Xz-2e for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:36 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:45346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3X-0000yW-H0 for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:24 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4083dbc43cfso8342325e9.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668191; x=1698272991; 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=eQMbFRIKcRrn8AaxGzNtgeRU1Ji7B1cAp0Z2yAp4SxI=; b=dIVi+ERnOcsootRW/ahABJKPbZvNM1C3S2Bj3buqmdNNFIKzAlptJCvono+JcysU+i IggZrbyTTovXeGFPwoMj8lSbTylBeV5gERwXIn+WSmvfn7eOs2JugBcoWsIWwWZwrUon NgLOmhIlT5wb6DLVh74XQRaTeFBidYIOpb5aHGX0dEEsMX7aScfy7eqB6WnMGQi1FJOd 7VyrkTZFsCs52FCnnfGRirQHM+ZNbq092oM+3AL7Z7Fr9CalYC/wKBnPxbnC7we2L2lt LpV9a64Rio04iYQHxVUYuOVlF9qxS5hngLBrnP1i1THyc5H67Fa2yQQk2wGpYQjOOXfu zHuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668191; x=1698272991; 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=eQMbFRIKcRrn8AaxGzNtgeRU1Ji7B1cAp0Z2yAp4SxI=; b=DUIZRlF4UTZ6cquAUWnzWdbYttGhICKHghuD2SLr46S5C/7Bc+k05BZBaDX0cJ16yV wOJVwLu3geAkBGKBSkCY6w3eEx+5owDxc34N3IeTfDyVICYVDbBW0/qMx0KleE9aL9VR 6cNF9fa5qRojuE72oIbMh4h8my0AV3Ko9OqiexKfCqKLLcBTJvYGk8HZVeaiyHO/gbyx eTRcVIGwhLP5dS5FNJ5XSK+Swl5IrPaNJbpyuky9GxnI9TeH88S3hIunW9v2AuGmI3TP UBUHbQXuJhqw1aCrR0nCVklnMW4mEYUpM9IwetdocLmSRR4QT/Ox21jiMwOpqjaWudQb Uy9w== X-Gm-Message-State: AOJu0Yw9pTLBlEFxLHqdKZvM1JOWsV70weNQNsUVekcPkjPdeIMV4yEl Vpkmei4hsiXvSH5aNquMGYI8Z7jZtBhYJQ== X-Google-Smtp-Source: AGHT+IGQIH+C7whqGw9gSY8JLY0ofY+VwNrGRAqI5REJFkd/qBBe7c3IjnZp0XLPZuDo5x0zZftijQ== X-Received: by 2002:a5d:43c2:0:b0:32d:9d0e:7841 with SMTP id v2-20020a5d43c2000000b0032d9d0e7841mr240635wrr.6.1697668191381; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:50 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:57 +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-stretchr-testify): Remove input lables. --- gnu/packages/golang-check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 7ca3cf5d64..46a72e4768 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -83,10 +83,10 @@ (define-public go-github-com-stretchr-testify (arguments '(#:import-path "github.com/stretchr/testify")) (propagated-inputs - `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) - ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib) - ("github.com/stretchr/objx" ,go-github-com-stretchr-objx) - ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3))) + (list go-github-com-davecgh-go-spew + go-github-com-pmezard-go-difflib + go-github-com-stretchr-objx + go-gopkg-in-yaml-v3)) (home-page "https://github.com/stretchr/testify") (synopsis "Go helper library for tests and invariant checking") (description "This package provide many tools for testifying that your From patchwork Thu Oct 19 01:28:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54984 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 9751927BBE2; Wed, 18 Oct 2023 23:32:00 +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 CA44927BBEA for ; Wed, 18 Oct 2023 23:31:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3t-0003vH-SN; Wed, 18 Oct 2023 18:30:45 -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 1qtF3m-0003nE-RL for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:38 -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 1qtF3m-00035Z-IZ for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4C-00029t-Mc; Wed, 18 Oct 2023 18:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 05/19] gnu: go-gopkg-in-check-v1: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682386137 (code B ref 66619); Wed, 18 Oct 2023 22:31:04 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:38 +0000 Received: from localhost ([127.0.0.1]:34928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3k-0001ZE-QD for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:37 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:57762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3Y-000136-RQ for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:26 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3226cc3e324so6506968f8f.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668193; x=1698272993; 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=+RdToAlrI7AlmvcdJvSk14iVcYd88ju/db9o4yRvWAw=; b=bJVThBWXI30ZkXJB6DTDOKZOEbI+ZpQWqDr80ieEgP9811VIgrGcpI+aYe0oFIrP1N 356B3l5n2iy8XDXd9ZmK1ZVVG8sizUG2IU4BaXjxhX015AfCSHyIk2ElyCqA4q1UnAPO /aaj62myBElhW8DgbVqUJnfsdnM5d+3zZfY26z7QM6nVT5Gp48UJIUYvGoCvA5DmBj3D N96aQD0gxqR0Rtb5dDM4Efy0U8ct6zrGjKDAdjDYmITF7U//3qJMQb8LvsBThStnMezs 8N5WbdpCPO4+euoOMXKmyHNflh3tjouj+91aQznPski9GIas1naWIxf2f15qukpYsHLN wJRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668193; x=1698272993; 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=+RdToAlrI7AlmvcdJvSk14iVcYd88ju/db9o4yRvWAw=; b=VFClMSbif2wmoLHni47R1+SVQHEJsshPQgQq13yarbucpzOhpnjvcV9Do2lJ8rN7EW bWVD7GOeaZ+Ye5SIpoONyvrEcuCiWkU9aCQIT5pDpIre/o1dvLEJX1GniSmn1tPd8dt+ Vl2cjvEG55+V7DQWarpvQckx9fd3XZgkqXpjhpq5P8UyBLPtljoD5jL4LOTYBfBPE3YX vaR8UbzPQ50NEz2ldGdBYYJwUIvV0mGiAJliSyguHistVAEexmS2H11opIC+CoFPE7bJ 32GrBEarh63du+xd3FgrZ/Y4OPgpO8ez1Ya+Z7ydg2flJ3WGXSJJxjTQMsB05rsUTkYN a4pg== X-Gm-Message-State: AOJu0YwFHb03LM7ORMmohFus37rxcdIM6pnl3vwmk6/WRpKRYK7rVwJB LFbexi9EO9iixmIPCppx9OnAw8fPbJ4Vkg== X-Google-Smtp-Source: AGHT+IGI5z6XUrXiKKpdnCFczIc7CtqfE2ovz3nJjhnhmdpuM364RyU3FxZv8vgU02V/FyA1RVEgXg== X-Received: by 2002:a5d:534e:0:b0:319:85e2:6972 with SMTP id t14-20020a5d534e000000b0031985e26972mr248337wrv.42.1697668192806; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:52 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:58 +0100 Message-ID: <2d0f36c510d18893cf00d824b2104bbf4cbcaafe.1697678664.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-gopkg-in-check-v1): Move from here... * gnu/packages/golang-check.scm (go-gopkg-in-check-v1): ... to here. * gnu/packages/bioinformatics.scm: Add (gnu-packages golang-check) to use-module. --- gnu/packages/bioinformatics.scm | 1 + gnu/packages/golang-check.scm | 36 +++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 33 ------------------------------ 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 45afde699d..96b59268d0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -93,6 +93,7 @@ (define-module (gnu packages bioinformatics) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages glib) #:use-module (gnu packages graph) #:use-module (gnu packages graphics) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 46a72e4768..81583a5ac7 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Felix Lechner ;;; @@ -23,6 +25,7 @@ (define-module (gnu packages golang-check) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system go) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang)) @@ -101,6 +104,39 @@ (define-public go-github-com-stretchr-testify @end itemize") (license license:expat))) +(define-public go-gopkg-in-check-v1 + (package + (name "go-gopkg-in-check-v1") + (version "1.0.0-20201130134442-10cb98267c6c") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-check/check") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn")))) + (build-system go-build-system) + (arguments + (list + #:import-path "gopkg.in/check.v1" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) + (propagated-inputs + (list go-github-com-kr-pretty)) + (home-page "https://gopkg.in/check.v1") + (synopsis "Test framework for the Go language") + (description "This package provides a test library for the Go language.") + (license license:bsd-2))) + ;;; ;;; 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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 05a68cdcc9..794e5f0f49 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5660,39 +5660,6 @@ (define-public go-github-com-gorhill-cronexpr (license (list license:gpl3+ license:asl2.0))))) -(define-public go-gopkg-in-check-v1 - (package - (name "go-gopkg-in-check-v1") - (version "1.0.0-20201130134442-10cb98267c6c") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-check/check") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn")))) - (build-system go-build-system) - (arguments - (list - #:import-path "gopkg.in/check.v1" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) - (propagated-inputs - (list go-github-com-kr-pretty)) - (home-page "https://gopkg.in/check.v1") - (synopsis "Test framework for the Go language") - (description "This package provides a test library for the Go language.") - (license license:bsd-2))) - (define-public go-gopkg-in-ini-v1 (package (name "go-gopkg-in-ini-v1") From patchwork Thu Oct 19 01:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54992 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 A0EF627BBEA; Wed, 18 Oct 2023 23:32:43 +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 C913827BBE2 for ; Wed, 18 Oct 2023 23:32:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3t-0003p1-Eh; Wed, 18 Oct 2023 18:30:45 -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 1qtF3o-0003o7-37 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:40 -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 1qtF3n-00035j-Ep for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4D-0002B8-JT; Wed, 18 Oct 2023 18:31:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 06/19] gnu: go-github-com-jacobsa-oglematchers: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682396190 (code B ref 66619); Wed, 18 Oct 2023 22:31:05 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:39 +0000 Received: from localhost ([127.0.0.1]:34931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3m-0001at-2t for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:38 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:58724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3a-00016d-2l for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:27 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-32dc9ff4a8fso1316019f8f.1 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668194; x=1698272994; 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=fF6kZ4AWUZzuIhK9h3TP+spRh35T+fqUOEhayqK/6Ag=; b=Tpsq55XPQMb9BdhiJm2ZL1pT6EinwRwK5WOTiLBZUV17QyjHWpEORUn1zVicGAbMyx +jplkN36P1QQtNkGSfI1CTvFYK4mJ0dPW+lyCNs1bksf9zytEf6B5YimAGU1Dc4i1TRf wsoHf/ic1YJebeHjbAcKtWRvCEiRG+oT0aWk8JYEI2GDjRxwgkiKHi2p6EB+gruVlPc2 6dEZH3FIgUhf68XpwMw88aSkPPx7owL4qpHVIIfwyGMyHlVzeAdviTPtpyd0YSDKcF5T S2hhuRM5UE1k3v7ASYNytJDgm5upP2qaRcacKNUfSzujMZlOGJY9+4c9KDatQ1zihHdo iayw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668194; x=1698272994; 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=fF6kZ4AWUZzuIhK9h3TP+spRh35T+fqUOEhayqK/6Ag=; b=KF3odyAo8H7iLMreJZuBhrzApKRokLFktlKym2Jl25UFdHUJk6m4hx2CvBjEWEdKP7 +rc0dL3B5bfKRTfM66toS2A3uJMlw05EsI35OXushsDQZ9XAKWzwAOrMZomtmaPoW+iY rtZbr6cW6r4Y6UPUy2psQRyAnkA08y11HgrXQIsDJJsZo1L8rmsxRWacVNuyPGR7N1e4 wrjdp/v9q6QyVJBRWzC4uCne6gjmmaPOEPwZ3R+PUGUk8W6t+T94j2EjAzeKf+65jwKA hVu514pRqTiuAceVSu6RoC02WG49Eo4P8yFHsQMkzOsucs1g5Ij5rf37OrO3GxKi9cn+ Ad5A== X-Gm-Message-State: AOJu0YwckMe7KUNjBpFyDcqwsUADHHEva2+BF9TfQev4rGYHZ/vjauFp sTiiWH5Vj1j2N398ktAi4FlVgRbYwIBUMg== X-Google-Smtp-Source: AGHT+IGxwEiIEdzAJ9HfbI6mT851MOIG+X3UMAvQHJkdpDVgSPzk3qEWdhe2456jTTo+rECangko4A== X-Received: by 2002:adf:e80a:0:b0:32d:9daf:3f8d with SMTP id o10-20020adfe80a000000b0032d9daf3f8dmr262108wrm.49.1697668194057; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:53 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:59 +0100 Message-ID: <5b418757f452ab9df4854027fa4ee0d6a6482135.1697678664.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-jacobsa-oglematchers): Move from here... * gnu/packages/golang-check.scm: ... to here. --- gnu/packages/golang-check.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 81583a5ac7..8c6bf03f74 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -38,6 +38,34 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-github-com-jacobsa-oglematchers + (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5") + (revision "0")) + (package + (name "go-github-com-jacobsa-oglematchers") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacobsa/oglematchers") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jacobsa/oglematchers" + ;; break loop with with go-github-com-jacobsa-ogletest + #:tests? #f)) + (home-page "https://github.com/jacobsa/oglematchers") + (synopsis "Matchers for Go testing framework") + (description + "Package oglematchers provides a set of matchers useful in a testing or mocking +framework. These matchers are inspired by and mostly compatible with Google +Test for C++ and Google JS Test.") + (license license:asl2.0)))) + (define-public go-github-com-jacobsa-oglemock (let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 794e5f0f49..afc1a9bd30 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1311,34 +1311,6 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto not included in the Go standard library.") (license license:asl2.0)))) -(define-public go-github-com-jacobsa-oglematchers - (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5") - (revision "0")) - (package - (name "go-github-com-jacobsa-oglematchers") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jacobsa/oglematchers") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jacobsa/oglematchers" - ;; break loop with with go-github-com-jacobsa-ogletest - #:tests? #f)) - (home-page "https://github.com/jacobsa/oglematchers") - (synopsis "Matchers for Go testing framework") - (description - "Package oglematchers provides a set of matchers useful in a testing or mocking -framework. These matchers are inspired by and mostly compatible with Google -Test for C++ and Google JS Test.") - (license license:asl2.0)))) - (define-public go-github-com-jacobsa-ogletest (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292") (revision "0")) From patchwork Thu Oct 19 01:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54999 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 EC83327BBE9; Wed, 18 Oct 2023 23:33:31 +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 26A6D27BBE2 for ; Wed, 18 Oct 2023 23:33:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3u-0003xf-HV; Wed, 18 Oct 2023 18:30:46 -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 1qtF3p-0003oe-8R for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:41 -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 1qtF3p-000363-05 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4F-0002F4-6L; Wed, 18 Oct 2023 18:31:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 07/19] gnu: go-github-com-golangplus-testing: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682426459 (code B ref 66619); Wed, 18 Oct 2023 22:31:07 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:42 +0000 Received: from localhost ([127.0.0.1]:34939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3p-0001eT-2L for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:42 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:43156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3b-00018a-Aq for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:31 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4081ccf69dcso913925e9.0 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668195; x=1698272995; 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=bKAWOjggOraGmpApfeE3Tg8Z6towPmVeIsvbc8PpQbY=; b=P9L4othipNhmr+njLvjAOhfSss09D0zUQ5lx0LIcfvS4czTp62BytnnSHs65WWOETQ fgHld8x1TjLymRfgMtlHXPXJbAMHyt718a8WSq9poqaGLUr2r7Gd4xZ0MWj+zBhSpJhO PFxMBioCkhq7w0gbq7Oe5SljU1CwXpCi8noARR6v+eqOiwb9mUXBCwLddj+SuFC7wgLh ypudaIInRj5lgfE9cya+tI/NUrGCDJQJPg5dFb17vv+QwW+rCBoJ8UktZZB8YVe+KHuf uGVoRkOYKjvDhUZMWmKuomBa0qO5A1WCXiCSVGduXgsgHR0S6e9hs1X+5CpmTuHqeLD+ fItQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668195; x=1698272995; 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=bKAWOjggOraGmpApfeE3Tg8Z6towPmVeIsvbc8PpQbY=; b=ID6lr26ZCufOujV1CzCf76cty0s+bUuhawufVP94gaMEeO4KK0s226Y3ErNd6rwuJ1 hbpLf8s8793bdnVHbSR0CJmR68zZz7J7DVU0r6dpkzYAAGKFOL0Pe7/yVcdyuHv8pKRD bBUkcnnbNCA+Dc4cmlaTi3nyFWL3zdegq/22QLZkisu1hheaZjfNA32ew0+KaWhNOW1K nElUbXdTjGQY1nMLLpb7eKB/uVMlg3VbsS2IK7Y7vo5ZCThzCmMoluUqwSQR4Oe+eCHO hMvnorRJd0IUVnKtaj6/stUO6TOgZGBsbO+YFHG9OSmH+Q7mcFjyhmvWERRFPLKeLcwz 43xw== X-Gm-Message-State: AOJu0YwuqYrTNnqohuzuyQTbRql97hxL+pW2GWM+URRkBeqJCtKK711E mi0up2U+2givDYxlpVngT40fs65amb2A8Q== X-Google-Smtp-Source: AGHT+IGwnwGgFhDOXt4Z5PBPPygpQCpfFz2GkT1TLG6iqd87FjaPGLRRmwVWTlVQbX55OdB5TGeCog== X-Received: by 2002:adf:b20a:0:b0:32d:c76f:299e with SMTP id u10-20020adfb20a000000b0032dc76f299emr103818wra.19.1697668195304; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:54 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:00 +0100 Message-ID: <5ffdd4424a9bbdf89b213601eaa5c386cdef08ad.1697678664.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-golangplus-testing): Move from here... * gnu/packages/golang-check.scm: ... to here. --- gnu/packages/golang-check.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 22 ---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 8c6bf03f74..414423a5ef 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Felix Lechner @@ -38,6 +39,29 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-github-com-golangplus-testing + (package + (name "go-github-com-golangplus-testing") + (version "1.0.0") + (home-page "https://github.com/golangplus/testing") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/golangplus/testing")) + (propagated-inputs + (list go-github-com-golangplus-fmt)) + (synopsis "Additions to Go's standard testing package") + (description "This package provides additions to Go's stdlib testing.") + (license license:bsd-3))) + (define-public go-github-com-jacobsa-oglematchers (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index afc1a9bd30..cfd7fb73ad 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3006,28 +3006,6 @@ (define-public go-github-com-daviddengcn-go-colortext ;; dual-licensed (license (list license:bsd-3 license:expat)))) -(define-public go-github-com-golangplus-testing - (package - (name "go-github-com-golangplus-testing") - (version "1.0.0") - (home-page "https://github.com/golangplus/testing") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/golangplus/testing")) - (propagated-inputs - (list go-github-com-golangplus-fmt)) - (synopsis "Additions to Go's standard testing package") - (description "This package provides additions to Go's stdlib testing.") - (license license:bsd-3))) - (define-public go-github-com-leodido-go-urn (package (name "go-github-com-leodido-go-urn") From patchwork Thu Oct 19 01:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54996 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 3260827BBEA; Wed, 18 Oct 2023 23:33:25 +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 5319E27BBE2 for ; Wed, 18 Oct 2023 23:33:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3v-0003zu-NQ; Wed, 18 Oct 2023 18:30:47 -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 1qtF3o-0003oG-EG for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:40 -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 1qtF3o-00035p-2o for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4E-0002CY-8I; Wed, 18 Oct 2023 18:31:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 08/19] gnu: go-gopkg-in-go-playground-assert-v1: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682406283 (code B ref 66619); Wed, 18 Oct 2023 22:31:06 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:40 +0000 Received: from localhost ([127.0.0.1]:34933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3m-0001bh-PE for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:40 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:59843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3c-0001BS-LC for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:29 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4083cd3917eso9603545e9.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668196; x=1698272996; 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=Awmf/MT/SZxHK5j+9zdBW1UrVO1dKIhN30RfqP4gmas=; b=ckAFOB1Qj33lS/uQDtNu1OmuJVivg/MrGFXht1U5x1k0VwpVEhMjaVKejvgehe/Z+M Z2bZZfqrvMpfUABzc9/kFRoBKHAGY/rog/n9K7UG7UqOF0pNwYI9XMkqbDBSbipg7yKm Mpy3j/d8MTwIVNvc5im/TVQEUdP6BGUZfAUhav30QlKB/W+KBJSkY6NSbXLauEYpyAlP wGN3qa7BUKraO4Q7JDmJvL3Kna02OQXbUgC3jetjQ/ausdS7h9XuliCT7feN0aFegBWj oZXqwu5Ma1BNFenQJs+3l9bKQBAzYzwm7Nc5MLEiSirCshsLz+WAP78WQvzPx814+zUU bXkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668196; x=1698272996; 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=Awmf/MT/SZxHK5j+9zdBW1UrVO1dKIhN30RfqP4gmas=; b=nh+BCjzqZGZNNU6Tw83XP2UOUZPj0IxtpAcf53pY/mxBZ1w+xbmtPPa2JLYKY4ZOT3 G1THx25wzyp9uoLRd5/UIPQ3AdQtlMW4IdD8CfzEqqUQlmlgHqyJ09++HeHWfELStpN9 chLhFS04b2mC2LBIEX4ZGtRnu//aefMPpFDFc8iuqgTTwU/ouCEyvocTvonswy8apG/4 IKt4gbeztuLXIq6uYHkupqgewev2CtQe68hjVMFcf788D73THTu7iLZXB6ejHkn1Py+m UZASCZNZ0MwZk7NY/7/0Kr71+vx7TxhAUH2SHaSf+1cRa3OtmNHX8lDTRCEG4euslofd clNw== X-Gm-Message-State: AOJu0Yx892gSPz05fUeAD6pOp0fLXLIgvw/nMQcx3dowW2sIHAEeiSCM /Xa6ROcSJMRxS58732pWRYfZRIL1s1+qWw== X-Google-Smtp-Source: AGHT+IEbg31XgcNvMd7qSHIBwDXWgBcNLc6vkKZl/mIrFz833L4n9jKvLeH/ArZvIx9MR2vcAtz/ag== X-Received: by 2002:adf:f8c8:0:b0:32d:90e6:c477 with SMTP id f8-20020adff8c8000000b0032d90e6c477mr245977wrq.26.1697668196600; Wed, 18 Oct 2023 15:29: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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:55 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:01 +0100 Message-ID: <92c77923ee6650a70e9582e8da7329590a0b4c42.1697678664.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-gopkg-in-go-playground-assert-v1): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 414423a5ef..4b7ca74cc2 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Felix Lechner ;;; @@ -189,6 +190,29 @@ (define-public go-gopkg-in-check-v1 (description "This package provides a test library for the Go language.") (license license:bsd-2))) +(define-public go-gopkg-in-go-playground-assert-v1 + (package + (name "go-gopkg-in-go-playground-assert-v1") + (version "1.2.1") + (home-page "https://github.com/go-playground/assert") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/go-playground/assert.v1")) + (synopsis "Basic assertion library used alongside native Go testing") + (description + "This package provides basic assertions along with building blocks for +custom assertions to be used alongside native Go testing.") + (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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cfd7fb73ad..c3cb30c344 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3064,29 +3064,6 @@ (define-public go-github.com-jessevdk-go-flags (home-page "https://github.com/jessevdk/go-flags") (license license:bsd-3))) -(define-public go-gopkg-in-go-playground-assert-v1 - (package - (name "go-gopkg-in-go-playground-assert-v1") - (version "1.2.1") - (home-page "https://github.com/go-playground/assert") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm")))) - (build-system go-build-system) - (arguments - '(#:import-path "gopkg.in/go-playground/assert.v1")) - (synopsis "Basic assertion library used alongside native Go testing") - (description - "This package provides basic assertions along with building blocks for -custom assertions to be used alongside native Go testing.") - (license license:expat))) - (define-public go-github-com-go-playground-locales (package (name "go-github-com-go-playground-locales") From patchwork Thu Oct 19 01:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55002 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 6634027BBE9; Wed, 18 Oct 2023 23:33:44 +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 4549227BBE2 for ; Wed, 18 Oct 2023 23:33:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3v-0003yV-1j; Wed, 18 Oct 2023 18:30:47 -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 1qtF3o-0003oQ-PV for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:40 -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 1qtF3o-00035v-HF for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4E-0002Dr-No; Wed, 18 Oct 2023 18:31:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 09/19] gnu: go-github-com-tdewolff-test: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682416359 (code B ref 66619); Wed, 18 Oct 2023 22:31:06 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:41 +0000 Received: from localhost ([127.0.0.1]:34936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3o-0001dF-3I for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:40 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:61809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3e-0001ES-1O for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:30 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4083f61312eso8351265e9.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668198; x=1698272998; 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=1qwPGk50UZpsA30g/WlzYp9gBnrNHkXh4CvuqIqBMxE=; b=U3AWXXTjN4Z0wdIgcgLHwou1eBxfRQT4YpDDQQvuu/gtXHXJ5+N8H5VyTakpSQRvJm O2ylLF+IxCx7sqVP8DpOD0RMcq6Zm2IEHORrZ1d32xumvHRBqe1/zc/mw68tjlovC9XY BBsDMR9tDMi26KD/kywhSr92NquvS0YLDf5hS3HrpGuSgD+LGGK4AZsUyCoxSxwhavAu rutfa2V+fL9mrvnBrKwOhm5wrriSvwGXcaiFIevLyk+zCCbetjaEXQtlJoYbJc79ZQdZ i/sMPDQOqqVrAgRaKZQjtAsPcqXCbO+J3gccEM70aagtdbceLZU/aZAZYZAQs/ihAqDQ 9LAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668198; x=1698272998; 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=1qwPGk50UZpsA30g/WlzYp9gBnrNHkXh4CvuqIqBMxE=; b=vPcSTiygbFSxtuYMcJq+uyqOuNNEhgZEtXnbNmj4AnNgDMEYPV2WsoIgYExiBrAK0J LrXpT1sWVNDNoLxknbjRKDZlF4z3fhfcpyCoLQoBPkolOTEW7fZUgHG/wWk/71ZfQAHm vL/BJcgyTbKj0UXTdPjU3L/0UFRJXutz/QmxD5tfkSn/E30Mlj9iYueNR9oamrUg1fhj mg79lwgvxfPleAwsT3ld0dhdGEv89da3asMJ3M6ks9YGlRNwqUTQQAt2V/8ilgTS3Amk 7pG9ITfiEF8bpB2uXlXEwNaBD99OtTEWz5WE7Si259U4m/ByBt9h3Cxd6kBsA3UI6bPa Kpyw== X-Gm-Message-State: AOJu0YxkJOEJTMxH0JTGh2qWpGM0sTUeOKf4gyuRS7i6BRkBTroIASFv O6zhUe9aet/1sP35AG7MkPnu10lxN0SWIA== X-Google-Smtp-Source: AGHT+IFGEFieH5j0xvw7HBOlzgWJjF8pq6vO/+fDd24DNveHringOnRBqsiSkd37wYSxRnGMxpQVyA== X-Received: by 2002:adf:ec0f:0:b0:32d:ae31:4595 with SMTP id x15-20020adfec0f000000b0032dae314595mr220642wrn.65.1697668198100; Wed, 18 Oct 2023 15:29:58 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:57 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:02 +0100 Message-ID: <1d697bcf2916a0c12517ce8e8b2aea4482b96a52.1697678664.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-tdewolff-test): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 23 ----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 4b7ca74cc2..fe442bdb8b 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Felix Lechner +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -157,6 +158,30 @@ (define-public go-github-com-stretchr-testify @end itemize") (license license:expat))) +(define-public go-github-com-tdewolff-test + (package + (name "go-github-com-tdewolff-test") + (version "1.0.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/test") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/tdewolff/test")) + (home-page "https://github.com/tdewolff/test") + (synopsis "Go test helper functions") + (description + "This package implements a few functions that are useful for io testing, +such as readers and writers that fail after N consecutive reads/writes.") + (license license:expat))) + (define-public go-gopkg-in-check-v1 (package (name "go-gopkg-in-check-v1") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c3cb30c344..effe3e7854 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3646,29 +3646,6 @@ (define-public go-github-com-tdewolff-parse-v2 "This package contains several lexers and parsers written in Go.") (license license:expat))) -(define-public go-github-com-tdewolff-test - (package - (name "go-github-com-tdewolff-test") - (version "1.0.9") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/test") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/test")) - (home-page "https://github.com/tdewolff/test") - (synopsis "Go test helper functions") - (description - "This package implements a few functions that are useful for io testing, -such as readers and writers that fail after N consecutive reads/writes.") - (license license:expat))) - (define-public go-github-com-tj-docopt (package (name "go-github-com-tj-docopt") From patchwork Thu Oct 19 01:29:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54985 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 3AFAA27BBEA; Wed, 18 Oct 2023 23:32:02 +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 2B8D527BBEC for ; Wed, 18 Oct 2023 23:31:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4T-0004SU-VX; Wed, 18 Oct 2023 18:31:23 -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 1qtF3p-0003p6-Qc for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:44 -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 1qtF3p-00036J-Ib for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4F-0002G1-NG; Wed, 18 Oct 2023 18:31:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 10/19] gnu: go-github-com-jacobsa-ogletest: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682436542 (code B ref 66619); Wed, 18 Oct 2023 22:31:07 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:43 +0000 Received: from localhost ([127.0.0.1]:34942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3q-0001g3-CJ for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:43 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:55364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3f-0001Gd-KM for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:32 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-32dc918d454so1547186f8f.2 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668199; x=1698272999; 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=AhZh27W48yRlotuR92GeCshUuc9Ro3E6wyQMZdcQ50s=; b=HDY8ekL68xx1zD6qzJPBtvINfZtw36Tz/NdC5/nE63H03N3vYb5Bmtm2wrMNCiSbvF D/E5LeLLNtb/S2LpiA+34flk+y0g4utJF9QnaoCt7xLkn5BRkI1aFs7O/UQwMxjEPNe2 H7ScMS72q7s6/FEQcnoz1aHZk6BRaAmrx+5Ri/hBLN2+x4i1T5xVOx3lAS5Pg01RVC0v ufAI7vwBhTYuf/fAggeG6UKS076I5tRx+iZR+cMbmdtTGZcenmIxB+jzJrY9OpKu91WU VxIL2wLD2LVf4xuFAuO4V/ZPN3Vnk+SACU8dCwaiWvgn+3Pn1DX4s9TdUtYpeJ4VN5Xj pFFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668199; x=1698272999; 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=AhZh27W48yRlotuR92GeCshUuc9Ro3E6wyQMZdcQ50s=; b=bO2hb5jAS+WDQW6DxyFBq3mmcgzD+LiRnHEJ6KJLk5MDTn+xcT6OQe4BzvWw3iIz8O xryeanLB9Xj2blKMg3NcBU12FEmsDNHHWet9UqCa9ReyV2ZYYrfPsVm0OFWWrUde0Sc8 2pgnke+IvvQPsqMlCGqGxHZfdy0y7d7aiJG2zCX16ONJLnzznOUrAKTCFeKamo1CGjiL HpGCb4nR7FvNJZ+3PJn6R/6RRe9H1v5zwZSksHJE8LJLokgXY/3aTKWVDbClJv65rQat ZGaUmYu6JQjofIOwM/iItmKgCOZbi/uCu2dAf6KboCzS510vYhPy/Q7HUaMBMnUCZMl1 XamA== X-Gm-Message-State: AOJu0YyD6qv9wjs0kt9OH+qMDirwZDbsnxbrsBpqkaFVw55G2twjBqaK uWq+dg55rUqJGKKbyMzvdlD4xC8VX6wN1A== X-Google-Smtp-Source: AGHT+IGnnRx/E/e4HCsCVXH6uWRqHzQqrYW+Zw7QGkApAO4Z0JWUe0Wrb8hfBZMFYw5zzFSK4KotdQ== X-Received: by 2002:adf:e7d2:0:b0:31f:f91c:d872 with SMTP id e18-20020adfe7d2000000b0031ff91cd872mr269694wrn.19.1697668199405; Wed, 18 Oct 2023 15:29:59 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:58 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:03 +0100 Message-ID: <9566ebdb5003bc044393ef850c369d2447479629.1697678664.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-jacobsa-ogletest): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 36 +++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 35 ---------------------------------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index fe442bdb8b..f904e8b02c 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -122,6 +122,42 @@ (define-public go-github-com-jacobsa-oglemock "Package oglemock provides a mocking framework for unit tests.") (license license:asl2.0)))) +(define-public go-github-com-jacobsa-ogletest + (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292") + (revision "0")) + (package + (name "go-github-com-jacobsa-ogletest") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacobsa/ogletest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jacobsa/ogletest" + ;; These tests should be made working + #:tests? #f)) + (native-inputs + (list go-github-com-jacobsa-oglematchers + go-github-com-jacobsa-oglemock + go-github-com-jacobsa-reqtrace + go-golang-org-x-net)) + (home-page "https://github.com/jacobsa/ogletest") + (synopsis "Expressive unit tests") + (description + "Package ogletest provides a framework for writing expressive unit tests. It +integrates with the builtin testing package, so it works with the gotest +command. Unlike the testing package which offers only basic capabilities for +signalling failures, it offers ways to express expectations and get nice failure +messages automatically.") + (license license:asl2.0)))) + (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index effe3e7854..04751b6a79 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1311,41 +1311,6 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto not included in the Go standard library.") (license license:asl2.0)))) -(define-public go-github-com-jacobsa-ogletest - (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292") - (revision "0")) - (package - (name "go-github-com-jacobsa-ogletest") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jacobsa/ogletest") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jacobsa/ogletest" - ;; These tests should be made working - #:tests? #f)) - (native-inputs (list - go-github-com-jacobsa-oglematchers - go-github-com-jacobsa-oglemock - go-github-com-jacobsa-reqtrace - go-golang-org-x-net)) - (home-page "https://github.com/jacobsa/ogletest") - (synopsis "Expressive unit tests") - (description - "Package ogletest provides a framework for writing expressive unit tests. It -integrates with the builtin testing package, so it works with the gotest -command. Unlike the testing package which offers only basic capabilities for -signalling failures, it offers ways to express expectations and get nice failure -messages automatically.") - (license license:asl2.0)))) - (define-public go-github-com-jacobsa-reqtrace (let ((commit "245c9e0234cb2ad542483a336324e982f1a22934") (revision "0")) From patchwork Thu Oct 19 01:29:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55001 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 E049627BBE9; Wed, 18 Oct 2023 23:33:43 +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 68AD327BBEA for ; Wed, 18 Oct 2023 23:33:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3v-00040K-Rb; Wed, 18 Oct 2023 18:30:47 -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 1qtF3q-0003rL-MU for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:45 -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 1qtF3q-00036O-DL for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4G-0002Gy-H2; Wed, 18 Oct 2023 18:31:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 11/19] gnu: go-github-com-google-gofuzz: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682446597 (code B ref 66619); Wed, 18 Oct 2023 22:31:08 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:44 +0000 Received: from localhost ([127.0.0.1]:34945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3r-0001hP-Cc for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:44 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:59654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3g-0001Hn-Mo for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:33 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3296b49c546so5675459f8f.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668200; x=1698273000; 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=e+CSYyu2UAd3c/czayf3oVSoB+flEnttERLQizTVvbw=; b=K93JcEMZURIUrMogGKj8H0SCn1rbmsnLU2kd3eyLa75gX56BsWRvPXurqIm3cwO7pp NmbYzdbPthpVGHYz+ePfK3kMQpMqUSAXOWYVEtHrXkBWdqBQ3fuywRz0tHd8bJRR82X5 8Y9eCeSnNNW8ufsRc33iB4HXEz2stfSAw/t5M0F0Y73dIrtOtIBprllcTx5OuMSstupv LyFkY8r+P+2nvhgqO7fxmTct9DiBZUEXLwZqY+DbjB/eG6kbdf/koiud0hPgX98YtWx2 hKtuERmp2IDr3+YGC02I9TzgQoU6VF97G7iITIXzRJYe8Bingy4rJbMJjXrkMo8zIgT+ swTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668200; x=1698273000; 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=e+CSYyu2UAd3c/czayf3oVSoB+flEnttERLQizTVvbw=; b=h+fnJvWJXIzND3yCqQi7Mpmd7byTVcWfV3Pn8FCjGRbGl4wUhmDUEjNxkmBsAdPhc5 gKf+kNqkG5blXQsxh2OG5iHOeLvQV4BquVNTykat+br2h/iVYBQftlOrzJnABaAJPmrH ujV+Eo/KAG7EyeJSDc7mxjTaf3Puy2VgOt3+HFn+dyO/53sgd3KtLXXc4N5wiYoY7jzp /iN5SwpP2ZdRjGlRZyqs9AzR4Y8UHRBy96mWXSmwHSQlj0oBx+7NxwtJhnFVBKJ7MUyS vhrTW02cA04UBNAb6Yj901SX2q9Lk5vH1yYHiK6KLYhYmxetXDkpHyvzBpzU7JnTduzQ sjpQ== X-Gm-Message-State: AOJu0YyhmEjwas4ozwZM8QdX8XDX7ZOUS/9Zz7Z7jznGBR/Mukjk5ztG NmuSMTnd8cLpM8o04IIr4eWqOS2wT8XXkA== X-Google-Smtp-Source: AGHT+IHCnKpB/QGe8/Lgn1AUds+0ceOjBNJQn05ih6GsAcint7D7nnpRt1zrMH7odbILiv+xgJN7QQ== X-Received: by 2002:adf:fa8f:0:b0:32d:a8aa:4d01 with SMTP id h15-20020adffa8f000000b0032da8aa4d01mr261149wrr.20.1697668200686; Wed, 18 Oct 2023 15:30:00 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:59 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:04 +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-google-gofuzz): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index f904e8b02c..9fdb5b0d9e 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -41,6 +41,31 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-github-com-google-gofuzz + (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") + (revision "0")) + (package + (name "go-github-com-google-gofuzz") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/gofuzz") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/gofuzz")) + (home-page "https://github.com/google/gofuzz") + (synopsis "Fuzz testing library for Go") + (description "Gofuzz is a library for populationg Go objects with random +values for the purpose of fuzz testing.") + (license license:asl2.0)))) + (define-public go-github-com-golangplus-testing (package (name "go-github-com-golangplus-testing") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 04751b6a79..1e78bfd5bd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4655,31 +4655,6 @@ (define-public go-github-com-google-cadvisor containers.") (license license:asl2.0)))) -(define-public go-github-com-google-gofuzz - (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") - (revision "0")) - (package - (name "go-github-com-google-gofuzz") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/gofuzz") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/google/gofuzz")) - (home-page "https://github.com/google/gofuzz") - (synopsis "Fuzz testing library for Go") - (description "Gofuzz is a library for populationg Go objects with random -values for the purpose of fuzz testing.") - (license license:asl2.0)))) - (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") From patchwork Thu Oct 19 01:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54988 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 EAF9427BBEA; Wed, 18 Oct 2023 23:32:14 +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 0A06F27BBE2 for ; Wed, 18 Oct 2023 23:32:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4I-0004Nx-HF; Wed, 18 Oct 2023 18:31: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 1qtF3r-0003rO-PC for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:45 -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 1qtF3r-00036V-Ef for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4H-0002I9-Iz; Wed, 18 Oct 2023 18:31:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 12/19] gnu: go-github-com-cheekybits-is: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682456666 (code B ref 66619); Wed, 18 Oct 2023 22:31:09 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:45 +0000 Received: from localhost ([127.0.0.1]:34947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3s-0001iH-4T for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:44 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:56581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3i-0001Kg-1z for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:35 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32d849cc152so6521175f8f.1 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668202; x=1698273002; 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=R3q8VZAGv8uekEM2KHOhMMDJq1O1+7nfeW9JkP+vWTY=; b=NpVYmGPjbCvIRJ8fd1Kv47WKBMcRLPC/r3C93BbzGBL4Dn8+wlLBb4dIhYtWqOMu7x iMROeqMfhpBS1eh5/9ycVfy1Q5Qw3hRcT6ND2U4uodO7OH6KwY4pikxOCngTNwwwXSam tlK8g8kRDNGP6DQ8xdEmg0ZDFbKnuk1bfSqel3ROdnDKSfJO7XHHKyyJfbMtvRuIclC4 KJT+Bz8u2yl/TVMFJrDAuHGRNisGuHjGPgMGS2tgUt5k2XLh3ut73hk+PLueh+aVsOhR VGAhfd5b8eDJuZ7dohOjo8LhMW6wRPDW+ND351y1CSf4YcmnVRfs4ne4PjexPpsCgZm3 8rdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668202; x=1698273002; 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=R3q8VZAGv8uekEM2KHOhMMDJq1O1+7nfeW9JkP+vWTY=; b=apo5qPr3pQM1BdlfTEpjtDdmAcCWG6KWiVecxfD5CFv5UL4Ih0LeyPFwF0IeV53EVx aNbCMIfP9gphgrIj+TVcC8NATbW/ntnF/pYhNpIqEdyGPZnplEWwK/IBjkYqNG/sgLRw Tus64rQYLTyVzOeaAkwDvgAyqGjzi7y2esXSqA8EJFTbqyNTTRCl50kaOJuqspEc624Z nGJZJwlEa3g8QtKAzpabkcOrRdbrgN/8dhsxt3S0XxU9jQS3S3DbBKiCiTKNsxabExXX iCTcZ7fG4f/ImBH3WJdqobe/eBPJFAzJN2RXVak9HmgYU47AziBVn3uvUGF5pl1QCZR/ Onxg== X-Gm-Message-State: AOJu0Yz51ETnI5fZHIeO8IXpCnKMjlcgDCF8hq1/wyEJeN9DnP+4xJns 0a2ll9Ds8/US9AVShVGxry+h0MshMKWbZg== X-Google-Smtp-Source: AGHT+IGqqLAfrWvIbC1wlAYAB75TCPtgMhL8mIzHsUFjDav6cL9z5+GLM8d8F1po8TTL8ND6/NdL6w== X-Received: by 2002:a5d:5444:0:b0:32d:a405:b6b7 with SMTP id w4-20020a5d5444000000b0032da405b6b7mr259094wrv.32.1697668201973; Wed, 18 Oct 2023 15:30:01 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:01 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:05 +0100 Message-ID: <32f98288de65f7086dc63f7097bed954811320e7.1697678664.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-cheekybits-is): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 32 -------------------------------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 9fdb5b0d9e..d10eced626 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Jakub Kądziołka @@ -41,6 +42,38 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-github-com-cheekybits-is + (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") + (revision "0")) + (package + (name "go-github-com-cheekybits-is") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cheekybits/is") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/cheekybits/is")) + (home-page "https://github.com/cheekybits/is") + (synopsis "Mini testing helper for Go") + (description "A mini testing helper for Go. + +@itemize +@item It has a simple interface (@command{is.OK} and @command{is.Equal}). +@item It plugs into existing Go toolchain (uses @command{testing.T}). +@item It's obvious for newcomers. +@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers +- because testing panics is ugly. +@end itemize\n") + (license license:expat)))) + (define-public go-github-com-google-gofuzz (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1e78bfd5bd..d43b43f905 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6806,38 +6806,6 @@ (define-public go-github-com-whyrusleeping-tar-utils (description "Tar utilities extracted from @command{go-ipfs} codebase.") (license license:expat)))) -(define-public go-github-com-cheekybits-is - (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") - (revision "0")) - (package - (name "go-github-com-cheekybits-is") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cheekybits/is") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/cheekybits/is")) - (home-page "https://github.com/cheekybits/is") - (synopsis "Mini testing helper for Go") - (description "A mini testing helper for Go. - -@itemize -@item It has a simple interface (@command{is.OK} and @command{is.Equal}). -@item It plugs into existing Go toolchain (uses @command{testing.T}). -@item It's obvious for newcomers. -@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers -- because testing panics is ugly. -@end itemize\n") - (license license:expat)))) - (define-public go-github-com-sabhiram-go-gitignore (let ((commit "525f6e181f062064d83887ed2530e3b1ba0bc95a") (revision "1")) From patchwork Thu Oct 19 01:29:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54990 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 5CAC727BBE2; Wed, 18 Oct 2023 23:32:34 +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 AF5EB27BBEA for ; Wed, 18 Oct 2023 23:32:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4O-0004RF-L3; Wed, 18 Oct 2023 18:31:20 -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 1qtF3s-0003rP-L1 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:45 -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 1qtF3s-00036c-CL for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4I-0002JN-F7; Wed, 18 Oct 2023 18:31:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 13/19] gnu: go-github-com-frankban-quicktest: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682456711 (code B ref 66619); Wed, 18 Oct 2023 22:31:10 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:45 +0000 Received: from localhost ([127.0.0.1]:34949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3t-0001jY-0t for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:45 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:55740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3j-0001M7-3i for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:36 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-323ef9a8b59so6601908f8f.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668203; x=1698273003; 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=FPw4Hr6azcIj6YuSs8NqdZnToAIbK///wNDCwASJu1E=; b=PeQtU5ai1DexnMKCDXYipg5bjE6+bn2OZiL1Gku2KJ6eFalyDAQDv44GtJVJ4Br8XQ ascR+5ekONKO1bF3hYrW/AA+0+AoK7apbv0Tajzd/wQRjbbKtXq66wYebwueHKEJLai4 iQqx/uL0Np6cxvIKYPw7cvLAyi2PqPkH6KyruwNMrUy7j7WCsd2Rlmuvu4s+qx+2MkpK kMCh3XTlFUKXlAGkISXeQ+jE3YmR16gSgBbt64Sso9iM1ylzX1tm9rdMr7rPRc0OlDRZ vE0IwKtLEJXEmgwnae0X1SKJGSdqz7zYz9cZzDjX6qF3AGS1wLgyrvf7xmXnWK5rPQGW 6hPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668203; x=1698273003; 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=FPw4Hr6azcIj6YuSs8NqdZnToAIbK///wNDCwASJu1E=; b=gkkGmRXZ65ZPL9UojEU1aKx+ugFaYIR9EnUkl3qV3ik2pePKBBad769PhVBvpSzruZ A8WPt7ZN+EKcJXxYtAS6pwB6eL2NlM+QEYrUrWHniA+fcb/FrLYTwPxiWHCZTjb3f7nG +vT1iMzxrvnCki+zMOJasWiWv5QCfX7B6dWmsVMM7E67DJncKzXUHxF1nER/XeM3zcoc YVifHr5G3upQucQeKdum+wNLS20s7Do3k6y81ZBCbDhZYUxe7ASDznXDQdYT1LsOcIUN KU1DdmdqBwK2A26ctNkVYiyuA4FgV9UGXOTERQrMOPAjZ9zHLrDuBJ68J7Cj9ijKu72N om1Q== X-Gm-Message-State: AOJu0YyhDKRqLdGtrQbdRF3zovOv02sjTXKC1wsw1mdh3cXEOPx6S7Mq 1r1ZLvhhDMWwcMNdEq2z7licoluYD/TL8Q== X-Google-Smtp-Source: AGHT+IEZsJoSMh0DLxRpanqTILlRoHJWjg5A9bGYaolyaLzIuxvCKk+ixuZ3U3Y+QDRcbbzWmFOQYw== X-Received: by 2002:a05:6000:1d1:b0:32d:b2dd:ee1c with SMTP id t17-20020a05600001d100b0032db2ddee1cmr248133wrx.5.1697668203213; Wed, 18 Oct 2023 15:30:03 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:02 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:06 +0100 Message-ID: <27ff2067679cee97867719e8f72dad3eb4569cdc.1697678664.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-frankban-quicktest): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index d10eced626..82bcfcd28c 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere +;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 Efraim Flashner @@ -74,6 +75,32 @@ (define-public go-github-com-cheekybits-is @end itemize\n") (license license:expat)))) +(define-public go-github-com-frankban-quicktest + (package + (name "go-github-com-frankban-quicktest") + (version "1.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/frankban/quicktest") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/frankban/quicktest")) + (propagated-inputs + (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty)) + (home-page "https://github.com/frankban/quicktest") + (synopsis "Quick helpers for testing Go applications") + (description + "Package quicktest provides a collection of Go helpers for writing +tests.") + (license license:expat))) + (define-public go-github-com-google-gofuzz (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d43b43f905..8860ec50fe 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10799,32 +10799,6 @@ (define-public go-github-com-gologme-log additions.") (license license:bsd-3)))) -(define-public go-github-com-frankban-quicktest - (package - (name "go-github-com-frankban-quicktest") - (version "1.11.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/frankban/quicktest") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/frankban/quicktest")) - (propagated-inputs - (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty)) - (home-page "https://github.com/frankban/quicktest") - (synopsis "Quick helpers for testing Go applications") - (description - "Package quicktest provides a collection of Go helpers for writing -tests.") - (license license:expat))) - (define-public go-github-com-bep-golibsass (package (name "go-github-com-bep-golibsass") From patchwork Thu Oct 19 01:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54998 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 F20AA27BBEA; Wed, 18 Oct 2023 23:33:30 +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 1F83827BBE2 for ; Wed, 18 Oct 2023 23:33:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4l-0004hY-EC; Wed, 18 Oct 2023 18:31:39 -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 1qtF3t-0003vQ-SV for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:45 -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 1qtF3t-00036l-CT for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4J-0002Ki-Hh; Wed, 18 Oct 2023 18:31:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 14/19] gnu: go-github-com-google-go-cmdtest: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682466801 (code B ref 66619); Wed, 18 Oct 2023 22:31:11 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:46 +0000 Received: from localhost ([127.0.0.1]:34951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3t-0001kJ-Lh for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:46 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:54435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3k-0001Nt-BY for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:37 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-32d885e97e2so6641590f8f.0 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668204; x=1698273004; 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=gGpQgrw1tVvv6lO5CLzlaJ//OCaO84MBUWblWeROXuo=; b=LJj4Net0vJ35Bwhyh5uuP+2cjukEwvQkFSad2kl/8/faZUYlZzlkGHQRbon3v2tdQJ vnpKzFI839cLGZtwnyzWxEb2Nh2/9HnKG8kIBGeHJk0Wd+4aNoyXp4ooYGkSt7qEImxW Nrqx9r3D+uUQpPuLfqBHSBHRVDKrGQZyWXg5O97iyfLbfIaFH+2u7qV43+wY5vdE5elz 8Vi8jFs1bCMgmf0DD9nJYnvCd+aHqtNXW8wwR3whWQbfrrwgS3afSYZa7OP06528PnLv ITt8VnZhC6YG2xKCw3AhyfCyR80yhb3zE9gttPTQh+NEKGtmw7WMBf0hj8RaV/ewVKRV ZS7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668204; x=1698273004; 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=gGpQgrw1tVvv6lO5CLzlaJ//OCaO84MBUWblWeROXuo=; b=ccmWFOWV/UmMp2RBnrb8RPOAHboMDQd73wJ4D6gvdH7aAArmKvAZufIlVec82SLbM0 VEqWZk46V9ruNHmoMVLCojfzVnPa2qqyxrSHxE4JgUl5lxJbcJeH2D95sbxQ3aRN+98D NRj03GrF2sfCV+SnU+V5dZpqVJJruYsEqZ33U4YM3SZIcIsdHv8jW7LoJCOkN8+/7sLk bQeifnKN1TrJZ/0+wm1i4jhj1Bo9/TZ5QxzxfCxvZ3Jtuh4L+YoDx53l8oIAd2g+mk3y zx4AqnYoJd/h71C627O2jF5JpQyxU7Y86mOjlmeeaSB0NE57KoidHoGdfmZOg+97Htoo HRNQ== X-Gm-Message-State: AOJu0YyBvpOPW0OUenomOER4ps3k1Cn3kRDKhNWarZmrycNag9J6FjPA SXi04xwX1AvmLPzGB7jd85EDVw/Wm7W6Og== X-Google-Smtp-Source: AGHT+IFla+efI40a114htSD3CptNSdt5JsoUXyDMsihl34LUyZnFacDPYr6pFFPkzeZUUHQHkkWxYw== X-Received: by 2002:a5d:42d1:0:b0:32d:a369:1820 with SMTP id t17-20020a5d42d1000000b0032da3691820mr204946wrr.64.1697668204415; Wed, 18 Oct 2023 15:30:04 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:03 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:07 +0100 Message-ID: <83848cf1ac84ad864cf014e0b9ccf8355da89c6a.1697678664.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-google-go-cmdtest): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 29 ----------------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 82bcfcd28c..eb4f085bbf 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Katherine Cox-Buday ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,6 +102,36 @@ (define-public go-github-com-frankban-quicktest tests.") (license license:expat))) +(define-public go-github-com-google-go-cmdtest + (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5") + (revision "0")) + (package + (name "go-github-com-google-go-cmdtest") + (version (git-version "0.4.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-cmdtest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/go-cmdtest")) + (propagated-inputs + (list go-github-com-google-renameio go-github-com-google-go-cmp-cmp)) + (home-page "https://github.com/google/go-cmdtest") + (synopsis "Testing for your CLI") + (description + "The cmdtest package simplifies testing of command-line interfaces. It +provides a simple, cross-platform, shell-like language to express command +execution. It can compare actual output with the expected output, and can +also update a file with new \"golden\" output that is deemed correct.") + (license license:asl2.0)))) + (define-public go-github-com-google-gofuzz (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8860ec50fe..5abe17bf3e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12860,35 +12860,6 @@ (define-public go-github-com-google-go-jsonnet implementation.") (license license:asl2.0))) -(define-public go-github-com-google-go-cmdtest - (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5") - (revision "0")) - (package - (name "go-github-com-google-go-cmdtest") - (version (git-version "0.4.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-cmdtest") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/google/go-cmdtest")) - (propagated-inputs (list go-github-com-google-renameio - go-github-com-google-go-cmp-cmp)) - (home-page "https://github.com/google/go-cmdtest") - (synopsis "Testing for your CLI") - (description - "The cmdtest package simplifies testing of command-line interfaces. It -provides a simple, cross-platform, shell-like language to express command -execution. It can compare actual output with the expected output, and can -also update a file with new \"golden\" output that is deemed correct.") - (license license:asl2.0)))) - (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") From patchwork Thu Oct 19 01:29:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54994 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 A050827BBE2; Wed, 18 Oct 2023 23:33:11 +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 50C6627BBEA for ; Wed, 18 Oct 2023 23:33:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF41-00047t-Aw; Wed, 18 Oct 2023 18:30:55 -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 1qtF3v-000414-VS for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:48 -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 1qtF3v-00037B-MK for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4L-0002O9-Rm; Wed, 18 Oct 2023 18:31:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 15/19] gnu: go-github-com-onsi-ginkgo: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682718949 (code B ref 66619); Wed, 18 Oct 2023 22:31:13 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:31:11 +0000 Received: from localhost ([127.0.0.1]:34980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF4H-0002Ib-Qs for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:31:11 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:48563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3l-0001Pv-KS for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:38 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-32da7ac5c4fso3638942f8f.1 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668205; x=1698273005; 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=TzuBCUemjOvTl5m5gGahuipt04Oin42lse8XMVK9s+c=; b=cCVpBUTFlnuGa9fRkyZwB8dAtPjFkhmXB18cpEXp2mrPO0shYKxK4/ld2/MqyaJNrJ sP9DGcknSUyO5xPFxP2cg0YGPz3AXdEzNqOWLk4yNz+WatRHdzC/HFit1sLHk/18OLnI CufxHhbKGfotI/xtWFmfGxb4S3dzSEPMlLJKSOJYmpY1sZFFp8KauYvm8RlTPXGsdhdM e3LYjlOGiA3Wj+hrhvxWTTnKf1xOF2pBavKyqJLJQlWUnB2Y6q+gKXvrqezEQUH0ajU9 gDN/HTTG2DPb+BMahwHS4wbCl9jEJ5Wo3wQFL+ky4yQrO/pCnDvVy5JfWB0ak3vHUd5z kZxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668205; x=1698273005; 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=TzuBCUemjOvTl5m5gGahuipt04Oin42lse8XMVK9s+c=; b=Mq6Hk7UixCKnxbAMQQrs50k4T5P27fIbecExKesExqEb+um4u6roeTkASZ97mS6LlH /kVLeXHuuC7Fc0KmwglswDhoZ/kkty5TAKAsNLMC2o/LguCFHdw7gPMwBh8TSemCDLUx Lp8s1ap37tK5pLz5m/dD+OE4DaXfmdzbr3MjbuyvuUxwyY9p1PEPWFJ5/h4kDoeqQRfY MF+s1Mt22AAMINIflJSsCn9KI9IT19oVuWJ8Tmz1hhx7dsu2dEqG9adO0R3+7FJ94Iir W9SXZUrGgHGABohXzHeg6m+t2mpm9R+rrKq3PLDbgDian3Ao0pV1PHtZMG3e8EszeUo2 nAMw== X-Gm-Message-State: AOJu0Yx5gDPKX8s/f37eA9jgd2Sic5nLoR/ZevUo7CxR4xC9LNLHBbcW H9mfeT1LzdBlHaT27WjYNwn9QYuy844qTQ== X-Google-Smtp-Source: AGHT+IHooXjgPZ0Xu7L/XohuyaG3qWn7+7tZODaHUo72MAibAC+8R44bh0Oo/06kIutXTp7Ekx27DQ== X-Received: by 2002:adf:e7c8:0:b0:32d:a2d6:4058 with SMTP id e8-20020adfe7c8000000b0032da2d64058mr241611wrn.62.1697668205607; Wed, 18 Oct 2023 15:30:05 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:04 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:08 +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): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index eb4f085bbf..ce4afe64ac 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2022 ( ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Hilton Chain @@ -274,6 +275,37 @@ (define-public go-github-com-jacobsa-ogletest messages automatically.") (license license:asl2.0)))) +(define-public go-github-com-onsi-ginkgo + (package + (name "go-github-com-onsi-ginkgo") + (version "1.16.5") + (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 + "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz")))) + (build-system go-build-system) + (arguments + (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 + go-github-com-nxadm-tail + go-github-com-onsi-gomega)) + (home-page "https://github.com/onsi/ginkgo") + (synopsis "BDD-style testing framework for Go") + (description + "Ginkgo is a Behaviour-Driven Development testing framework for Go. It +builds on top of Go's builtin @code{testing} library and is complemented by the +Gomega matcher library.") + (license license:expat))) + (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5abe17bf3e..3ff544a67b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -13615,34 +13615,6 @@ (define-public go-github-com-onsi-gomega "Gomega is the preferred matcher library for the Ginkgo test framework.") (license license:expat))) -(define-public go-github-com-onsi-ginkgo - (package - (name "go-github-com-onsi-ginkgo") - (version "1.16.5") - (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 - "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz")))) - (build-system go-build-system) - (arguments (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 - go-github-com-nxadm-tail - go-github-com-onsi-gomega)) - (home-page "https://github.com/onsi/ginkgo") - (synopsis "BDD-style testing framework for Go") - (description - "Ginkgo is a Behaviour-Driven Development testing framework for Go. It -builds on top of Go's builtin @code{testing} library and is complemented by the -Gomega matcher library.") - (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 Thu Oct 19 01:29:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54995 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 105D927BBEA; Wed, 18 Oct 2023 23:33:16 +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 1FECE27BBE2 for ; Wed, 18 Oct 2023 23:33:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4W-0004YO-4x; Wed, 18 Oct 2023 18:31:25 -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 1qtF3u-0003y0-Js for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:46 -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 1qtF3u-00036y-As for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4K-0002Lq-Ft; Wed, 18 Oct 2023 18:31:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 16/19] gnu: go-honnef-co-go-tools: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682698771 (code B ref 66619); Wed, 18 Oct 2023 22:31:12 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:31:09 +0000 Received: from localhost ([127.0.0.1]:34970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF4F-0002Fr-Hy for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:31:08 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:58829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3m-0001S9-Tk for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:40 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40842752c6eso3922235e9.1 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668207; x=1698273007; 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=KWp0RQUVe9ShhIP5X3GNa6VLnLy2U1ZY04p9Q6WHo5E=; b=Flpjrcy3TDJVDP1KRno0CqFHKqwKLS4gbkOK7wmzrqRfdxdCFoxjD+7qvJqX9fkLZX vqL5fCdDbLGcGxulrImkNE7fhkZy3zi/sgUvCTvD/WWNZueFoX6ge+S1Yj0GJK8hKxMk SKss2B0Bb8lpw0RfYW4Lr+zEZXwveGCqt2Iw40hfegKX20+j1ZKfNW3UQ988Eoa0U/Kh KPPn7cOCu20oVVxLorU0skX373/4oFAWz0P1mxwIQvO4ArRUsUt9M1xtUha3hlV5RaTw IRkTU1NaZRSV4q/FSzSgJShLVq2uPNZxiXloYfc2X7e4KJcP0s9tt9AlkkmhoxdNnPf4 pTaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668207; x=1698273007; 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=KWp0RQUVe9ShhIP5X3GNa6VLnLy2U1ZY04p9Q6WHo5E=; b=Zi5PQ388g3bvgHx7GZO+2hirbgJ0GCc39LJaHFleTZcpLK4yN+RmUj2nIKtzuGpTma ePU4a0SnhEQ5FWZlpqZSO9GPsYkQ7IMt7SGa3ai73GVzgZe15AE0zrqVCXdP1xFPSfXi WT8Xec8KaxauighkqEeVeVN8/3rQV4cU/JeLh3fiPjb+pFaUkVUze2qyfYKW0mdXAi8N mI2rbRZJkHZJw9oQXmgZa9BQZ+JzewtK4e5WizwjVdXa0dgVeiMWzIh3etxtxg5erq1A He3g1x00sewAoDpmS+8zr9ruU6+wM0cUzpF2R0Kz1hAOGvIA49/u9RO+xIPun8BtY5g+ iE1w== X-Gm-Message-State: AOJu0YyBFfHyIx2sl8Gn0H7/THxQCbXQWi/SbZWm3+sQVgpmpNyUD6ve GvfDgD+b/1/0+q7cS9mb+J4hWNxIft1ykA== X-Google-Smtp-Source: AGHT+IHER/fKIL+/dw6c6LHqVgLlvPJOnT4VibjS7vR9kaZe5K2CaZz6n6vF64X9XOgrBP8sgyigNA== X-Received: by 2002:a05:600c:3594:b0:407:8e85:899f with SMTP id p20-20020a05600c359400b004078e85899fmr471961wmq.16.1697668206814; Wed, 18 Oct 2023 15:30:06 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:06 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:09 +0100 Message-ID: <2c59da6a5b7158ba1ca65e7fa74ceafdc33bc41e.1697678664.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-honnef-co-go-tools): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 36 +++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 31 ------------------------------ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index ce4afe64ac..011198231d 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 ( @@ -45,6 +46,41 @@ (define-module (gnu packages golang-check) ;;; ;;; Code: +(define-public go-honnef-co-go-tools + (package + (name "go-honnef-co-go-tools") + (version "0.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominikh/go-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32")))) + (build-system go-build-system) + (arguments + `(#:import-path "honnef.co/go/tools" + #:tests? #f + ;; Source-only package + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs + (list go-github-com-burntsushi-toml + go-github-com-kisielk-gotool + go-golang-org-x-exp + go-golang-org-x-mod + go-golang-org-x-tools)) + (home-page "https://honnef.co/go/tools") + (synopsis "Staticcheck advanced Go linter") + (description + "Staticcheck is a state of the art linter for the Go programming language. +Using static analysis, it finds bugs and performance issues, offers +simplifications, and enforces style rules.") + (license license:expat))) + (define-public go-github-com-cheekybits-is (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3ff544a67b..2503fca0b6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11529,37 +11529,6 @@ (define-public go-github-com-kisielk-gotool tools with similar semantics.") (license license:expat))) -(define-public go-honnef-co-go-tools - (package - (name "go-honnef-co-go-tools") - (version "0.3.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dominikh/go-tools") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32")))) - (build-system go-build-system) - (arguments - `(#:import-path "honnef.co/go/tools" - #:tests? #f - ;; Source-only package - #:phases (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs (list go-golang-org-x-exp go-golang-org-x-tools - go-golang-org-x-mod go-github-com-kisielk-gotool - go-github-com-burntsushi-toml)) - (home-page "https://honnef.co/go/tools") - (synopsis "Staticcheck advanced Go linter") - (description - "Staticcheck is a state of the art linter for the Go programming language. -Using static analysis, it finds bugs and performance issues, offers -simplifications, and enforces style rules.") - (license license:expat))) - (define-public go-go-uber-org-zap (package (name "go-go-uber-org-zap") From patchwork Thu Oct 19 01:29:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54986 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 B607127BBEC; Wed, 18 Oct 2023 23:32:05 +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 E007B27BBE2 for ; Wed, 18 Oct 2023 23:32:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4D-0004IS-Jc; Wed, 18 Oct 2023 18:31: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 1qtF3v-0003zm-Hd for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:47 -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 1qtF3v-000376-8x for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4L-0002NB-FG; Wed, 18 Oct 2023 18:31:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 17/19] gnu: go-golang-org-x-lint: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682708845 (code B ref 66619); Wed, 18 Oct 2023 22:31:13 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:31:10 +0000 Received: from localhost ([127.0.0.1]:34976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF4G-0002HM-Oq for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:31:09 -0400 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]:61666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3o-0001VS-Cf for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:41 -0400 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b9c907bc68so96455311fa.2 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668208; x=1698273008; 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=N4uYyjTkrfXFMDxwgR4Dpe2UANPb6imIZQ0Gu2I2+WA=; b=nm3qAyAHlPJJwyBSnB30PYcLTjNExcCyZy0GMCCb5iHd48xDMFrccSomzrigUnP1eo jx5zqbBNBdgUN2+QgTfpfdFxjD+WFxMFmRf04SVAvhaKW/HCMNOQaxT4BFUIF9kGDPi0 VNnXyVS63IIJxn68Xp2u3r9hrt2FzjvZCSe8KPwQdLQTMp8G96tsX+FvLQ1FrIrgmnB5 rcGGwGkx133JNdc20UojqYNf27hmTFDV+/u6Z4PSB4dTeHeAQIiazjfLvusy6P4yqzGy uD59lWwLh3TqR8+56mA0jODYHPttAh3f4e15lRCvzY6w+FbYPldOoFleVeUifxE6NF/z DSCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668208; x=1698273008; 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=N4uYyjTkrfXFMDxwgR4Dpe2UANPb6imIZQ0Gu2I2+WA=; b=jCU73J1yY2tThprhHHziyvoHmchkIjzm1L+oZPPPzzUa8izFWEVKT3v6XJAP7zbiTk aEpOvCy7xEuogoP/5L4eKozW1xCLd5JrhTTStpLzrlgLzMQAAvSCiykWNHeKar04jEiW YTExTvlFcuKoyKxAF69wulD0m8rsN/0VdlZIQR+dju+mChh05tB7IDxkUG99oUyWdE7a jfPlmiYNqih5p2MfG46JkRDkBlj8wYL8gftor2Coztd3vqNwu8YtG81MGoQF3wXrt9Vz 445IqBAmdKOL6zjV/opN1KfJ3d7u+jbI9aifGVjUXespC83+p/kdevJ59vZrCBfeq2bb R62g== X-Gm-Message-State: AOJu0Yx9mCmQ6LyUV7XayEpT47tYN+ZA3dv8cdwKRKGyi9yW01fq64Ot 3Am528aKk7Rzii7fCvVYkKDDIh5JaBVvnA== X-Google-Smtp-Source: AGHT+IHx9DOko9SmQnjoOsF0VtApAxg9cEG61UKxBm41WQzL3heCc/o0vWz4Tlu2xb0fYMHyzew/Qw== X-Received: by 2002:a2e:a4bb:0:b0:2bd:102c:4161 with SMTP id g27-20020a2ea4bb000000b002bd102c4161mr172754ljm.43.1697668208139; Wed, 18 Oct 2023 15:30:08 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:07 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:10 +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-golang-org-x-lint): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 011198231d..56f412224e 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -458,6 +458,34 @@ (define-public go-gopkg-in-go-playground-assert-v1 custom assertions to be used alongside native Go testing.") (license license:expat))) +(define-public go-golang-org-x-lint + (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") + (revision "0")) + (package + (name "go-golang-org-x-lint") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/lint") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/lint" + #:tests? #f)) ;; TODO: Fix tests + (propagated-inputs + (list go-golang-org-x-tools)) + (home-page "https://golang.org/x/lint") + (synopsis "Linter for Go source code") + (description + "This is a linter for Go source code. Unlike gofmt, it doesn't +reformat the source code, it only prints out style mistakes.") + (license license:bsd-3)))) + ;;; ;;; 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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2503fca0b6..e5dd116766 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11477,34 +11477,6 @@ (define-public go-mvdan-cc-xurls (native-inputs '()) (inputs '()))) -(define-public go-golang-org-x-lint - (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") - (revision "0")) - (package - (name "go-golang-org-x-lint") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/lint") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/lint" - #:tests? #f)) ;; TODO: Fix tests - (propagated-inputs - (list go-golang-org-x-tools)) - (home-page "https://golang.org/x/lint") - (synopsis "Linter for Go source code") - (description - "This is a linter for Go source code. Unlike gofmt, it doesn't -reformat the source code, it only prints out style mistakes.") - (license license:bsd-3)))) - (define-public go-github-com-kisielk-gotool (package (name "go-github-com-kisielk-gotool") From patchwork Thu Oct 19 01:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54983 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 EFD0827BBED; Wed, 18 Oct 2023 23:31: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 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 B2F7A27BBE2 for ; Wed, 18 Oct 2023 23:31:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF4l-0004kD-Iy; Wed, 18 Oct 2023 18:31:39 -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 1qtF3w-00042C-Dq for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:48 -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 1qtF3w-00037H-5Q for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4M-0002PQ-Ak; Wed, 18 Oct 2023 18:31:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 18/19] gnu: go-golang-org-sql-mock: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682729031 (code B ref 66619); Wed, 18 Oct 2023 22:31:14 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:31:12 +0000 Received: from localhost ([127.0.0.1]:34984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF4J-0002KD-3j for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:31:12 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:61632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3p-0001YE-CA for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:42 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4064867903cso77148935e9.2 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668209; x=1698273009; 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=Qadg0QL02Q0Ri51Vg266jCTr1ERuwsuTXclwyTkHOzo=; b=J1TKpcHfpocu6o++kZ1lXP3KSDlBSn5wPzUcj2rFKh1pAqlDp3id7SmyXaKUWptONY UWEQEnmPyc5d81knIukx0WAHo1KySeaPXRmKYY9PU9Cm//RuNcqhnKHy5pQXBqtcY1/T rSU8YCc270HygY8h1Ms26udJ+xPMGBbsG5by3ys1Thea1mtLv7/jkCJdg/Q3ScpzEf8E ojGO8c81jhLnflv/B5qo1j0HIQANRHR4vMaqNLqZJ2gtHyD7FbZ4JueGwkTiiLDW/cUa jLSWXStYmUH1CvcwqGycoayJ4z90b7IikcmiPewjX2yrk8fDUn9tqJl5DlF/Aq2TFVcD drsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668209; x=1698273009; 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=Qadg0QL02Q0Ri51Vg266jCTr1ERuwsuTXclwyTkHOzo=; b=oisFlgPRdAdmxQNuevRHlEI9HYG5xqbQWwKLEE8eeQzcGKnfXcvt7Zyr+cRmBFMqtw sARsf7hzggBkuOqvb7aGs+bui4GBJw9E3+T2bkHkgjOL3i7ttvlsBqhYEp2dVpQNN1tZ 9EmSy935KtRRk++OoocApADlL5Dm2gVZnQfDBw00MSdrqwiAO6rI/NyZABclfaF7c8pz K8Af8rK/dZ4/lOheDWP+tDuwWnNS8uun+DEvtdo4qcBjl5OkXZ8zcP0viqEvYE0fB+8E /+5BnIOVo9Hl9zH/BWYRGiAjw3KJ6bqf2nZCUP6nafWD5cGNMuPF/zt4OrbLAfCFS4kE AHZA== X-Gm-Message-State: AOJu0Ywo/+NMYNtqpk2vt/YF6NZWVUjl8QAYuymHKzhA0rSGPS/Q+kzQ Ko+Oe53L7E9xJ42cAz9Abv7m6mMHWhIcxQ== X-Google-Smtp-Source: AGHT+IEIDWBpn+IhuUVjA18t7MdvBi9pvErFdHYxnURiYO6YiZYJNq4wb4TM2zta5acAWSWAlaNwJg== X-Received: by 2002:a7b:c8da:0:b0:406:4501:9095 with SMTP id f26-20020a7bc8da000000b0040645019095mr435437wml.40.1697668209420; Wed, 18 Oct 2023 15:30:09 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:08 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:11 +0100 Message-ID: <8ae71268e6de91f7c157e413c0ca90fa64ee009a.1697678664.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-golang-org-sql-mock): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 56f412224e..8fc9d2fbc0 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere @@ -458,6 +459,32 @@ (define-public go-gopkg-in-go-playground-assert-v1 custom assertions to be used alongside native Go testing.") (license license:expat))) +(define-public go-golang-org-sql-mock + (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") + (version "1.3.3") + (revision "1")) + (package + (name "go-golang-org-sql-mock") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DATA-DOG/go-sqlmock") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/DATA-DOG/go-sqlmock")) + (synopsis "Mock library implementing @code{sql/driver}") + (description "This library simulates SQL-driver behavior in tests +without requiring a real database connection.") + (home-page "https://github.com/DATA-DOG/go-sqlmock") + (license license:expat)))) + (define-public go-golang-org-x-lint (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e5dd116766..aedf509c97 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7228,31 +7228,6 @@ (define-public go-github-com-kr-text (home-page "https://github.com/kr/text") (license license:expat))) -(define-public go-golang-org-sql-mock - (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") - (version "1.3.3") - (revision "1")) - (package - (name "go-golang-org-sql-mock") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DATA-DOG/go-sqlmock") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/DATA-DOG/go-sqlmock")) - (synopsis "Mock library implementing @code{sql/driver}") - (description "This library simulates SQL-driver behavior in tests -without requiring a real database connection.") - (home-page "https://github.com/DATA-DOG/go-sqlmock") - (license license:expat)))) - (define-public go-github-com-go-sql-driver-mysql (package (name "go-github-com-go-sql-driver-mysql") From patchwork Thu Oct 19 01:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54982 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 30F7327BBEA; Wed, 18 Oct 2023 23:31:39 +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 D3A5627BBE2 for ; Wed, 18 Oct 2023 23:31:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF44-0004B2-U6; Wed, 18 Oct 2023 18:30:57 -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 1qtF3w-00043p-U4 for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:48 -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 1qtF3w-00037N-Kz for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4M-0002QZ-Ps; Wed, 18 Oct 2023 18:31:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [PATCH 19/19] gnu: go-github-com-alecthomas-assert: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 22:31:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66619@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66619-submit@debbugs.gnu.org id=B66619.16976682739114 (code B ref 66619); Wed, 18 Oct 2023 22:31:14 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:31:13 +0000 Received: from localhost ([127.0.0.1]:34988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF4K-0002LY-5A for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:31:13 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:49376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3q-0001Zt-Lu for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:44 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40776b1ff73so46566415e9.2 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668210; x=1698273010; 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=ZsZTBMSSdEjS6bYlrqkftMPmWePczgPohI+0sAaTAEo=; b=l+EFLpEokvAUPmseoAi02A0/YYvoX6uCfGM5uQ38Tbj1AyW8m+iM83+E1Gu0xL2F89 1YJJd4t2PgAEn3jiPrvhNRhEZvmN5nbr7suH7n+/Qwh7LGtojfFcSVl6QTW5hEV3u8nl Bll1f2vNJEOhI4riTmYZr7SLH4qOvI9G0sgstmxLI3LN+Ho2Q4XNyhBWBIFTv6Zj377I xJ8RTxusDXqaARySQDD4jfHGFx1k9a7qgkQvjIux5SWUSAyAKhKa1lhZE1FRq806HwA1 9HK2Ck6YBtNJCN6WicEzlBK9p5GqE3daxqrGM7/gEDv4cgs7iZFVQzVvAkJMEVdTOTgo DHJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668210; x=1698273010; 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=ZsZTBMSSdEjS6bYlrqkftMPmWePczgPohI+0sAaTAEo=; b=cJGeVLn2LwEWAB9LSwrp3DbuOg1Hclv4YGQLAqs3hhhxv9liGq3gGczjecvB+CLVnP t9+KJ4NFy0ELlItaOcXeN/YUY4L+vJrZ5IpfDAlc9Wmg2b4WbtI61UJgaZW5Bw/i6STK azNiM6L2rV7lzbx4iwY8ts72+MAeUXpxU1+6mefPlB2TDATYJ458ur0JQ/EAvGsI+73C yojoRRJWYsauSKKKZw50jG1gOv6P9Sj7gskC+IMk2FblD+W+NNV6sLDojAdmWs2T4EV8 PDwS7IjKzwZzg7kODmdji96U5ORCVcYoJGa500XapdlU6nQSBb58e5bMZqH4dk/kF5Bg Pyiw== X-Gm-Message-State: AOJu0YxKsogG6D/UqVzBU9eltDX/CRylEnDYS4I663RC8orFGhxFhacj yWB7qBmxDymp/kqTywDvhtbB54iKjwbIyw== X-Google-Smtp-Source: AGHT+IHE0hIVI3E46Hpyk+KUM9nM1VWoGQomOt+20wL2MttGLnhxSuVZDuGua3lRpln20NIxx/ICCw== X-Received: by 2002:adf:f5c3:0:b0:32d:9a87:b7a with SMTP id k3-20020adff5c3000000b0032d9a870b7amr212361wrp.50.1697668210685; Wed, 18 Oct 2023 15:30:10 -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 x6-20020a5d6506000000b0032d886039easm3032951wru.14.2023.10.18.15.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:30:09 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:29:12 +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-alecthomas-assert): Move from here... * gnu/packages/golang.scm: ... to here. --- gnu/packages/golang-check.scm | 35 +++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 31 ------------------------------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 8fc9d2fbc0..42e501a6e3 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere +;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Sarah Morgensen @@ -82,6 +83,40 @@ (define-public go-honnef-co-go-tools simplifications, and enforces style rules.") (license license:expat))) +(define-public go-github-com-alecthomas-assert + (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06") + (revision "1")) + (package + (name "go-github-com-alecthomas-assert") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/assert") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/alecthomas/assert")) + (native-inputs + (list go-github-com-alecthomas-colour + go-github-com-mattn-go-isatty + go-github-com-alecthomas-repr + go-github-com-sergi-go-diff)) + (home-page "https://github.com/alecthomas/assert/") + (synopsis "Go assertion library") + (description "Assertion library that: +@itemize +@item makes spotting differences in equality much easier +@item uses repr and diffmatchpatch to display structural differences in colour +@item aborts tests on first assertion failure +@end itemize\n") + (license license:expat)))) + (define-public go-github-com-cheekybits-is (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index aedf509c97..b32e379e47 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9219,37 +9219,6 @@ (define-public go-github-com-sergi-go-diff @end itemize\n") (license license:expat))) -(define-public go-github-com-alecthomas-assert - (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06") - (revision "1")) - (package - (name "go-github-com-alecthomas-assert") - (version (git-version "0.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/assert") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/assert")) - (native-inputs - (list go-github-com-mattn-go-isatty go-github-com-alecthomas-colour - go-github-com-alecthomas-repr go-github-com-sergi-go-diff)) - (home-page "https://github.com/alecthomas/assert/") - (synopsis "Go assertion library") - (description "Assertion library that: -@itemize -@item makes spotting differences in equality much easier -@item uses repr and diffmatchpatch to display structural differences in colour -@item aborts tests on first assertion failure -@end itemize\n") - (license license:expat)))) - (define-public go-github-com-alecthomas-chroma (package (name "go-github-com-alecthomas-chroma")