From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sF8kJghdMGUy1gAAG6o9tA:P1 (envelope-from ) for ; Thu, 19 Oct 2023 00:32:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sF8kJghdMGUy1gAAG6o9tA (envelope-from ) for ; Thu, 19 Oct 2023 00:32:40 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2836567A6B for ; Thu, 19 Oct 2023 00:32:40 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=ZQjtGqVO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697668360; a=rsa-sha256; cv=none; b=Ee3VzQcIsfJjmYyb/wwxOqiAkF3Yu0x/55bvucCSqMEAbA6iXFR2CnLtGDPb+bPj57ddAv i9EVBYjkf2Vf80Jm14C8mBRmnZQPE2tY36jyT1ZrGVJcAJAaucck/4E1FfcBJhtyLSaKXp y6v85al4VzRleRtVMbBfmdJkTgZCSHQHrwno3bvthUtMYl47COzcr0F0sYym/k/lrOqCMm 8VFiVJF5jo/VTKbEhOYaSz25XtDYi+J1lT4CTpAKNVrvnRcivP7t2oCmJKk90U2pPzacdO BHc0gDDIIE+F3+c3w9XTBgtg/nnjj307Sq5ttLlkGU/D/8HItyX4mp7UqmY6UA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=ZQjtGqVO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697668360; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Zem9JaLTdItEhzq/eTvfMA36brcLPmMeF6XUofwSU5A=; b=j7RHWEp0RyWxjrry2vpJu77t5FsrRrQiJPEKhi28yrdCqVBCWrhioG7UYgzF9i7DazNP2H jYzEcGXMdkSBIpNjGcQyqdUtdAnYubr3s07UqSl9LsmIic8uBlczMpM/x2EWEjeEbn05uR 4GIaGkZkdHA0vvCNKwHaR5SbxQspeetYrJ8hyDhPB0B5FcqI/ElCa/PbiZ3sh3rKtNG9TI p36POLzTOsOBigk3L8CS7ByyLZgoMkJmGud0zZVteWoIot5nNyfLpXu1mlftPve1uRntbT 9AxQsDwJh+kTRHG6Owe/qUOegmE0plh/1evuk1sIaSIghvZqGXW8icE/+9wewA== 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam: Yes X-Migadu-Queue-Id: 2836567A6B X-Migadu-Spam-Score: 10.83 X-Spam-Score: 10.83 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam: Yes X-TUID: p33VB0D92NbT * 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) -- 2.41.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 8DLkFh/OMGVzOgEAauVa8A:P1 (envelope-from ) for ; Thu, 19 Oct 2023 08:35:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8DLkFh/OMGVzOgEAauVa8A (envelope-from ) for ; Thu, 19 Oct 2023 08:35:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D2E14400CF for ; Thu, 19 Oct 2023 08:35:10 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=IrPmdql7; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697697311; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Zem9JaLTdItEhzq/eTvfMA36brcLPmMeF6XUofwSU5A=; b=UKr8/VGfpzWRAofQSVTT0dAw1M0qoV4gnmgkS1QvLrh84hlbIxpizLBLZsnUM7+UHkcl/I z3mPgy9oS3zZKkRQFhnQPNBLrNOPmOvhChP9acOefZiEYFXnMv1jCKgLJXSxqpGoB3VHjh ZRU5Xy4KotY2kpfB9IbAtMLWLvvVtr1cOajjvUzz7p4GQAUHKfigZpt5h0//7sBEpKUiWr EF5hyqgsdoLwCj48Wbw3FV7rIC9G6ppyEaKVs9mK9pw2GHhnsLwXL+QMDSsedoRbS3TC67 Tkdy57HZaWleJaCY2NorMOQII1tGhao3gg1WdejkhKkSnYqW4dc1COOm/vbA1w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=IrPmdql7; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697697311; a=rsa-sha256; cv=none; b=dG5PD865cbR4Qc+7PzkjHYX9ta9O43l0a46hsfWWBYvGN+4X2rAozkC1CuJofTv+8U32zu rpN4E934yRDg/U1HXcz+k99AHDH62ijzjgjvKe4JHGR1k3FvZqEliQcg/bybh4z4jHpKR1 RhP7Jh2La2eI07emmMntyt5+meRGOIAY+5WMyKts9iHDTUAc98dpE9mAD/bTkQQaQ8k9Iy AHt0aP829fia23AlMtBwJBCEVXAsjl+z46r8gJHZdxYr+J9g+eIgQAln+0UYDtXb1Kh+hU 151Tck/cEWDB/YoeoNdZgnH+Tf8bZ8e+4COezrdLYr8fdf9olU6UoFdLbZDKjg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtMcD-0004Uf-OP; Thu, 19 Oct 2023 02:34: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 1qtMcC-0004TR-Md for guix-patches@gnu.org; Thu, 19 Oct 2023 02:34: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 1qtMcC-0001vd-Eb for guix-patches@gnu.org; Thu, 19 Oct 2023 02:34:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtMcc-0002NC-Pn; Thu, 19 Oct 2023 02:35:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66627] [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: Thu, 19 Oct 2023 06:35:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66627@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66627-submit@debbugs.gnu.org id=B66627.16976973059089 (code B ref 66627); Thu, 19 Oct 2023 06:35:06 +0000 Received: (at 66627) by debbugs.gnu.org; 19 Oct 2023 06:35:05 +0000 Received: from localhost ([127.0.0.1]:35614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtMcY-0002Lq-7Y for submit@debbugs.gnu.org; Thu, 19 Oct 2023 02:35:04 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:46199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtMcP-0002Go-1b for 66627@debbugs.gnu.org; Thu, 19 Oct 2023 02:34:55 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32d834ec222so6619458f8f.0 for <66627@debbugs.gnu.org>; Wed, 18 Oct 2023 23:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697697261; x=1698302061; 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=IrPmdql7j0yG0ZI/Kw4/VcgNjFP8tTELav8Is1izWkFBf7nCpNZ889KYi5ODTCtkky 1nmqEJyZqny3+B+mZwMUYDduFhSaG3TUcDtjqOev3His4NVpVv2X9wRAhWVu6gxPeNAj wc3BMFx7uZR/fTrPZ1yzjLIR1InCAfWo7SXAmXSQk17KIGiDGgvt7IKt1WwanhfnFXZW UAWz56rIhLmX7xbSTxmWnn6be02HplnE3Xz3i42m5YOmx/J5A/YWtb87pBCGDjziLhM2 ZAHoTyj1xJzOaffTNTcgkIVtTGZ/ZopZ8XszDRJLVscGx9dGp202zB99dKLzxOzaeUbr +IGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697697261; x=1698302061; 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=ifQJ0QKo2kL0eFqguUH5/hf+mEohw9kL8UwhP+pefk7A3T9UADpTLFW5KcWu9cdNpa 7PMxyMuRjq5FHK6Q93+upyXp4ZmpshHtYSeNEWD/Nx1u/jcwriqSXdN0Upt/gHmyt92A zYaQeioyRDCsRjLGfJMllm8ctkIcbWk9in6GfzjYICBJD2tSnt0DoSkqCOfC8IOvWv+e /NgSwLGZzshEwtgpI+hTJYdaovVsr84b4kOchwn1BEn2xXosBOTnojSNPKhjxf/QQaoB 9FPV1FytEJD1b5It1jtdin9nuAZSvanW4cGa71UI2nOz75ydhZxNQ++vQw9x+6vb1veZ tpnQ== X-Gm-Message-State: AOJu0Yy7boDb+44TFqPoh2bTHof9rI6b9w/8nPxtCrSAabEYMOfmhgVW S94Jo8Od5Nk6eT5y78qSA9vD5p7NLpVCcA== X-Google-Smtp-Source: AGHT+IH1a+1KkHz8j+CIMUwKaFI5mRRkSEO33G8AnAHMleTA/rw6LChGTq+WitE9k6OoMkDywpsDTg== X-Received: by 2002:adf:cd90:0:b0:32d:ac49:2bb1 with SMTP id q16-20020adfcd90000000b0032dac492bb1mr764316wrj.63.1697697260528; Wed, 18 Oct 2023 23:34:20 -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 q1-20020adffec1000000b00326b8a0e817sm3694739wrs.84.2023.10.18.23.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 23:34:19 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 10:33:43 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 10.87 X-Spam: Yes X-Migadu-Queue-Id: D2E14400CF X-Migadu-Spam: Yes X-Spam-Score: 10.87 X-Migadu-Scanner: mx2.migadu.com X-TUID: 6RPnuPoVL2Su Message-ID: <20231019093343.OkRjBI6uPsdiXxtGwuHlqFbYuBN-ST_iGGahfAzi8Yg@z> * 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) -- 2.41.0