From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 yAxSJDddMGURBwEA9RJhRA:P1 (envelope-from ) for ; Thu, 19 Oct 2023 00:33:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yAxSJDddMGURBwEA9RJhRA (envelope-from ) for ; Thu, 19 Oct 2023 00:33:27 +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 2521A46B46 for ; Thu, 19 Oct 2023 00:33:27 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=MEF17awb; 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=1697668407; 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=XAfYi6L9k9xJij9sd1hb9P8jziDQzZ0aiDOLyw+nI6A=; b=dZmUF3Tk8yoyU3SVH8rL+Ft+T7d8TFUa/8nA1J3G9MfVRQLQjdds46ayF+KPOojoLRQhbG J5SYZ5WhJjAr166J9SQ3gFEsJ5znSfYTMLB9UDpOr5ha23UoAYFiiDAR3HAiJy58T816uq PmUW/JQNguLut+ZipeUWzBDlGw/t1sbZBn2EbRsVF2tFiVTyh6CrsklJV8UHDNlso7+eNq LXgicv8DN8z5Z/hto+H7Abbi4dDcOjae690JoADMJc4pxHeqgdKZ5V6U/q3bhJB7r/K/YQ kMf6xRlyXNZPLEwA0mlyyovrkNoR8DB4rTXE5GORKOWaJzXBFBN7BMNq2y9QmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=MEF17awb; 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=1697668407; a=rsa-sha256; cv=none; b=S7tQYBYsbVkui4ZS76OBmA2E4hd42P+0mk9bEkBehxhtGEb+wotf6Hxei77FZQStW2HCio 1IEUbMvbgGT45CiV+T3zS7VAencIOKqurejUe84D/ZkPDOr2uAWuzlAUkIcEIiObozgyGa QlJlakvf31F1ZZd4Z3V8/Wi8mp0axnnULhJi1v+ZJhJHaKrL2LK6bvZYfsgN9fEHRbgvbF 7KcTxPXkqQj79yAUXe+2AiLJYy91tpHcPFxgXeOzMNjL26kq5ZoNqFlq8QIko9cjWl1XWQ T+duyV4pLtcBkmrVCp26ssUl1L29v5Whnf+vDimr/Zyi9jeiGUuDTK9YKstFiw== 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 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: 7.87 X-Spam-Score: 7.87 X-Migadu-Queue-Id: 2521A46B46 X-Migadu-Scanner: mx2.migadu.com X-TUID: FNmstfr/TLu/ * 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")) -- 2.41.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id EEgHMgvOMGUNBAEA9RJhRA:P1 (envelope-from ) for ; Thu, 19 Oct 2023 08:34:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EEgHMgvOMGUNBAEA9RJhRA (envelope-from ) for ; Thu, 19 Oct 2023 08:34:51 +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 5B8BB50047 for ; Thu, 19 Oct 2023 08:34:51 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=YRReJD5f; 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=1697697291; 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=XAfYi6L9k9xJij9sd1hb9P8jziDQzZ0aiDOLyw+nI6A=; b=ItNJ8pQsX5gqOxkWgE2uF6noUYfnpLijpjrjnLN3aBuMsxu/tb+05qHmKfpW+N+jEBb5jm NMq70GFgLiPO/Qwl6KOqapdurRK/HwlswdlXds5uKMiyuwpgGNZgmO1Vvrib/IBqAiVvrI Sw7c2MUPdUfejE4KajAuaq3hZVCmktZ+9N9JYDcZuhWr/3yEfGOOR2hj7dqtnqd6eeQL1B WB02iRDV/vg4AhtvPwqH/WOU3ZyzwfKzJr5B9JIthFT7cXTmuskOOjISKXmzvhHeSaRWqc SJI2WHwOfUTtwzjAysNRoHxp5IuHhL9q8LzP2dP0LpUMqyl+rZM9lf3vfuhDPA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697697291; a=rsa-sha256; cv=none; b=NG4wRbrxKgUh8zW0xNEkAxkj/MVm/CBVkCbIyMb4edvH2ZDOyRpalqyrPIpF1zOLv/4oK9 UhCE8GA2RpukOlISNqH/0TQKzNl0t/68heEEB+oUDTcmjP06iPhSaatTw3nXrbah3NR2XG wFHgRl5FlGbd1V4eANj1DwKkrTSUCjTmIYMiWkNf2FgrZaFPcwt2dmOd1hzGjRtkPv5bbv 9caHayH5d4IItorJcQpY0a3MoNVwKb8HTT4XEIosf4VlQa888jr2zP7MDF5C+iXW8P7EJx Rr+jpSZhgn5Lt8tCyspWkp1Xann2N1VgBn9fQd3CAX5L5nYrKty1HfTp4y21kw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=YRReJD5f; 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) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtMcB-0004T3-DA; Thu, 19 Oct 2023 02:34: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 1qtMcA-0004SZ-LT for guix-patches@gnu.org; Thu, 19 Oct 2023 02:34: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 1qtMcA-0001vR-DC for guix-patches@gnu.org; Thu, 19 Oct 2023 02:34:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtMca-0002MS-Mz; Thu, 19 Oct 2023 02:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66627] [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: Thu, 19 Oct 2023 06:35:04 +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.16976973019022 (code B ref 66627); Thu, 19 Oct 2023 06:35:04 +0000 Received: (at 66627) by debbugs.gnu.org; 19 Oct 2023 06:35:01 +0000 Received: from localhost ([127.0.0.1]:35607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtMcW-0002Kt-Fy for submit@debbugs.gnu.org; Thu, 19 Oct 2023 02:35:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:55532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtMcP-0002Gp-Hs for 66627@debbugs.gnu.org; Thu, 19 Oct 2023 02:34:54 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40838915cecso15465475e9.2 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=LO0ObeOpbaeCutVF+R2mjv9helQYSBmEnm8moiaDr5k=; b=YRReJD5fwh/tGMVr2kqSJ1/zYfI4H+SnTlYxMr7wsPAkKCrWIqerJ6mOrqrnFaLemb LsLs0tC4GClsszrc8uGg1RU4ppLeG7BK8zY6fli97tPntecrHVda7PPNuYrkkQszHgQp 80DookjiEEbjBspafz8VD3PHLVZn5Y+LmjV4bJv9E8j055wqcOtsr1i8ZC1GZG9Yi24E t50YDg1hWek3H36bMQSWeJJwvJnI9ivYuNSLM9CKlPJ425Zo1YgshBaQedla5oPrJbZr Kxb0tN9EIVn27JKLrjHNsCtxSJkbeIGa6WElU9rflrkndQva/T4fqhUfVmPaEveL2MHE GzjA== 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=LO0ObeOpbaeCutVF+R2mjv9helQYSBmEnm8moiaDr5k=; b=by3h/JPEbm5fl1s0HnYrxD3oO3wuTfXi1IYUiqXNlO5e0czB9DylefpbDoD3NHO9Ig eTiOtj0SD6SNmWk4RcN5PpBa9EHhINgdEhT1MR20BvzgdHz3U8Lbq4J3fFqZoOTTtXXp FpRuMDuqv+lT+h7LNnDU/3KS6LtAU3rsRv1wLkmkFyLjLFdZgrCEJbLKReEvSyC9m2qC lXAyoaCKvR4K9Y2EtSHI0AzRoHfKwqT1zpnQuWh9bTK/e9Dgp/s9orTkFeYfFpB5LO2S xh1wcehgFLqeqY0NnPpOi1G8ZvitUVLVS36QEW7PJXHpOvHtrdroSTsvXi16sCr0d4/c CD2Q== X-Gm-Message-State: AOJu0YznjuU9+YtA20JyBxPgog9OaqKYsIclOzDa1Ov/UP7r87wG5k94 KeaJac+9dJg+XQlruSpXusuF7BxYPXOpVg== X-Google-Smtp-Source: AGHT+IHw7siw7LrO0OkQP2LncoycDpk5/usOb1oYOUysysQtWGJdBlXSW/YYoOpD+T+iim2X3z5U3A== X-Received: by 2002:adf:fc46:0:b0:32d:65ab:2228 with SMTP id e6-20020adffc46000000b0032d65ab2228mr805593wrs.11.1697697261312; Wed, 18 Oct 2023 23:34:21 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 23:34:20 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 10:33:44 +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-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 7.85 X-Migadu-Queue-Id: 5B8BB50047 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: 7.85 X-TUID: 9XOhow+C9D4C Message-ID: <20231019093344.BHvQSQ7IP7vO84csQM5wbE7UOcUAs9uplairjYpVmT0@z> * 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")) -- 2.41.0