From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 ULqlBBrOMGUgpwAAauVa8A:P1 (envelope-from ) for ; Thu, 19 Oct 2023 08:35:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id ULqlBBrOMGUgpwAAauVa8A (envelope-from ) for ; Thu, 19 Oct 2023 08:35:06 +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 A8B105A29C for ; Thu, 19 Oct 2023 08:35:05 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SUOkyLw6; 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=1697697305; a=rsa-sha256; cv=none; b=q3cLQnmii9/mDi2/hkbh8smwpkSn6nnAntQZ/KFH9OShi7zg44IiHakhPezttUJlLBldmM Gbecf+Fso836uy+XvoZoi+p4dMxoDhYhbvCiZ5nY04bopEVPV9A8w6hJiGPAdlGvV1/QNG M10yzXvW64MGqCDw9u6XaaQ4m1t3AYiXbEUuCAGJYStp4hFhnTfKOjXWELECFBjMdO5NGf kGtjNcsI7e1HStn4GeyK31Vh2nH2gVVmccyxJwbThryS6/tsR/Wlw7PR6TO8dQ6kfdfen0 akorV5eQGrLUXdVPNY3eX+wNymS14T9qlKaTVIKcak7wzAUD7WBzyKPtgqGvCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SUOkyLw6; 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=1697697305; 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=+RdToAlrI7AlmvcdJvSk14iVcYd88ju/db9o4yRvWAw=; b=QqXLyuwP9tMKGeYXve/NMwL5FTIT1fyoPqJjuLAr4b+4NG8y/uZS3C7wCDhGWk69ynxk94 r+jigar6fp9bN7mkZ0YTQqjnoW3m3OdbNFNKDovF9GUfZ0KBrRdgRnRibGDDKCfqoZnM/w llw/320m7pLSGWK7ZFEMIYcD3+VOMaYqlqRMF5QN8iMW0sKE7uxxwd274wFYSLyHhn3L+O FE1DyKH9YP/BetfXWOpNYTKo4mkUhqYZxWXNgiWKyd4h2ojW7v08S/C3THdgitEaDtcHog CbqzKbLZ/s+4XiaHp9/Qhwwju5Aq4p6m5kFr/0wVFLr1I0SsFL71J4kiaUOSuQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtMcE-0004V5-FH; Thu, 19 Oct 2023 02:34:42 -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 1qtMcD-0004Uh-Sv for guix-patches@gnu.org; Thu, 19 Oct 2023 02:34: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 1qtMcD-0001vt-KB for guix-patches@gnu.org; Thu, 19 Oct 2023 02:34:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtMcd-0002Nh-Vy; Thu, 19 Oct 2023 02:35:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66627] [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: Thu, 19 Oct 2023 06:35:07 +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.16976973069134 (code B ref 66627); Thu, 19 Oct 2023 06:35:07 +0000 Received: (at 66627) by debbugs.gnu.org; 19 Oct 2023 06:35:06 +0000 Received: from localhost ([127.0.0.1]:35626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtMcb-0002Mv-Rf for submit@debbugs.gnu.org; Thu, 19 Oct 2023 02:35:06 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:56562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtMcR-0002Gu-73 for 66627@debbugs.gnu.org; Thu, 19 Oct 2023 02:34:56 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40836ea8cbaso17984285e9.0 for <66627@debbugs.gnu.org>; Wed, 18 Oct 2023 23:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697697263; x=1698302063; 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=SUOkyLw6AVspiArcKj2e/3OB/HoJvDOMxEeDeJ5L7fyDEW9BTEB5tWPD8TFpXgCox1 /keRuqmz7mg9G2YDkazFVz3oRrYf2djnJmXvSyJz03I7Gq7213brXWJvj9fyfyRvCxKP SX9e56O3w5HMJNad7d5tpDcqlViPuiPnF0jc1yhhjaH7iZLkxFb/lxIBoso/cSOIgSth PtrSTdQmlmMbyBwaXV/YpUifRhhZ3lA0Ygjx8BvhiZxaiYhHtcqn7lCTGlQ0G301+oCA iKZRzdqy5uPSa+1rtUC9WWHi9bTQfPlc97581tlxEI6YnbSqvI7DctV9Qj0lRqtV8+aK Y1fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697697263; x=1698302063; 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=AFSj5qRgnulz9HlqtaZCvieu6B4x6gfo5PP2ixEmyNtogw3mykDXaymfqFVA0RoCXa 7XEF2bgUvPAix7C1tIaKhalg46wFrKV3J/oX32gnuEHitIBdz1MR+vTzQ12a2XGgHZUP /gVpujXWt9TvZFPbUtuE5+43CHu6vcmcjdmJwE9i9hAtHzqZRblwSxAin1+CW0fgbsiz nPuV+t0iTWp6wKCNDt9vS5aabh/xsxYJlJytwuAlXCknCOyEmMQqBejVbD/yevJiUBxG qlKYR5TUy4wQ9YbAPL/2PrRnxDBVvONVaXBteXXkt+4weIOP/w6k95jKV+TP/T53tdZ5 mL2g== X-Gm-Message-State: AOJu0YxWQUTbiGAg+IpeVlNQ3l5pp2aJUONRsKgyJ7Zw1M2bpLVKHEsP qww2MbDsfLblHmUXwXFxzsheVZV3XZMuzA== X-Google-Smtp-Source: AGHT+IHAWt8e0FzTpz8FJTJ44KuSaeLqYeG8q9LIOYy/U/izPluk45SyYceyIDJUGRs5FzpEBLcdQQ== X-Received: by 2002:a5d:4992:0:b0:32d:a2bb:c99b with SMTP id r18-20020a5d4992000000b0032da2bbc99bmr711763wrq.55.1697697262924; Wed, 18 Oct 2023 23:34:22 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 23:34:22 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 10:33:46 +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 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-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 7.84 X-Spam-Score: 7.84 X-Migadu-Queue-Id: A8B105A29C X-TUID: rRphDC3W2RLX Message-ID: <20231019093346.2y305ZQYxFtYowIQ8aTUowHzB8oA8Szs4uooJsQOcXE@z> * 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") -- 2.41.0