From patchwork Mon Apr 1 10:43:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62430 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 ED00327BBE2; Mon, 1 Apr 2024 11:44:59 +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 4FCD127BBEE for ; Mon, 1 Apr 2024 11:44:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF94-0006tD-Cz; Mon, 01 Apr 2024 06:44:06 -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 1rrF93-0006si-JB for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:05 -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 1rrF93-0002PG-As for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF96-0005uA-A8 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 09/12] gnu: go-github-com-onsi-gomega: Move to golang-check. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824722679 (code B ref 70123); Mon, 01 Apr 2024 10:44:08 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:07 +0000 Received: from localhost ([127.0.0.1]:49677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF94-0005tY-Tk for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:58598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF90-0005qZ-Rn for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4156abbcc02so2163165e9.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968234; x=1712573034; 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=tVIL2Y8JA3hFrkzCNxHYukZiDx1kwVFUbcv5J50Sa28=; b=GM5lx1woocY4W16CAhtBuq2qovG7m0Ff5zxlQBRcK91vuIGHv4p6wsaUfj6UTZwKaT eaQSno6nxaf25izYTbvEy5KtYn7sZB1T8ywZC4H1AQEQtaVd4W9kO0SzXIwnxBHQ3zoo XzTH4yAZxyvvRlF7AjRDfAxbC41IjjN2W7+LfjpegtXYuP7JuIH7XOV2AWilGV9zs+g5 TMEJds9p6/KBzNtSkiKU8WrNVlUOAjU8DL69DI4q1OmkM49ImCE4uN1RdQFsl/sp9EK9 Kx7TmKDwbci9WGdGZCZmwOD+8TS4BuaIKEyRLW2ITF9+exNTvkY0u5vRzoXV2S2oa5gt L3hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968234; x=1712573034; 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=tVIL2Y8JA3hFrkzCNxHYukZiDx1kwVFUbcv5J50Sa28=; b=Ui+xWZ+FKG4w0J0lenIofcpw9RmmHS3cba/MGaa4tvt6/HbX2e5yKII6jbtm4PPnYd C5eATj5inExZ16xFzC0dghLqVhDY/dmU8dqbVVm60IHesfoemFCmiQNfMw/K5Mxcq0i/ gqjydDQSRSUKXCUY+jkJabm835FFj+T6l4Ibu8hFiIKxM+UMBEunk1cLWpfpwcvu0Bb1 Hfx0Q1o7Vx8hcCgJy+euX6nxRbXQeFfBaDG9w2axiCBxhRJ9ViJblgNmRn0X/qfF/8hL EpWTn8n5xTyn0NN5LwmxmgHsL/IEv2mQjspbPnzRZVAf1JDG7VKg/l44a6TpT3fKb4Ga pdNg== X-Gm-Message-State: AOJu0Yx9jREOgxbOcd3XSYBIGFLRbKKJjZ643srssarcom4lpf0ogHrq upGxyBbJPqDTJbkPIE+oFBdABt2YbSzzSWG210MORAnUzlQ9trANB9QI1ql5DVs= X-Google-Smtp-Source: AGHT+IG9k/09U75YXBlYCkvZKudDy0BWgcYhNf/2esniVUQVxco/IERmEoHUY5BB5tq68JcDvs+Z7A== X-Received: by 2002:a7b:cbd4:0:b0:415:611c:cb31 with SMTP id n20-20020a7bcbd4000000b00415611ccb31mr2560144wmi.11.1711968233975; Mon, 01 Apr 2024 03:43:53 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:53 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:39 +0100 Message-ID: <397b362c1c189c1f85d861b74818c26b985723b4.1711915492.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-onsi-gomega): Move from here ... * gnu/packages/golang-check.scm: ... to here. Change-Id: Ia9a7d0e88ebda2fcfb3fe623163e270756900e94 --- gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 31 ------------------------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 8ea0c45ff8..dd91bf23bc 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -487,6 +487,39 @@ (define-public go-github-com-onsi-ginkgo-v2 go-golang-org-x-sys go-golang-org-x-tools)))) +(define-public go-github-com-onsi-gomega + (package + (name "go-github-com-onsi-gomega") + (version "1.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/onsi/gomega") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/onsi/gomega" + ;; Unless we disable the tests, we have a circular dependency on + ;; ginkgo/v2. + #:tests? #f)) + (propagated-inputs + (list go-github-com-golang-protobuf-proto + go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-text + go-google-golang-org-protobuf + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/onsi/gomega") + (synopsis "Matcher library for Ginkgo") + (description + "Gomega is the preferred matcher/assertion library for the Ginkgo test +framework.") + (license license:expat))) + (define-public go-github-com-prashantv-gostub (package (name "go-github-com-prashantv-gostub") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 711c007138..3c3d9c7222 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10271,37 +10271,6 @@ (define-public go-github-com-lithammer-fuzzysearch library bevacqua/fuzzysearch.") (license license:expat))) -(define-public go-github-com-onsi-gomega - (package - (name "go-github-com-onsi-gomega") - (version "1.19.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/onsi/gomega") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/onsi/gomega" - ;; Unless we disable the tests, we have a circular dependency on - ;; ginkgo/v2. - #:tests? #f)) - (propagated-inputs (list go-github-com-golang-protobuf-proto - go-golang-org-x-net - go-golang-org-x-sys - go-golang-org-x-text - go-google-golang-org-protobuf - go-gopkg-in-yaml-v2)) - (home-page "https://github.com/onsi/gomega") - (synopsis "Matcher library for Ginkgo") - (description - "Gomega is the preferred matcher library for the Ginkgo test framework.") - (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