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"))