From patchwork Thu Oct 19 01:28:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54984 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 9751927BBE2; Wed, 18 Oct 2023 23:32:00 +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,URIBL_BLOCKED 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 CA44927BBEA for ; Wed, 18 Oct 2023 23:31:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtF3t-0003vH-SN; Wed, 18 Oct 2023 18:30:45 -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 1qtF3m-0003nE-RL for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30: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 1qtF3m-00035Z-IZ for guix-patches@gnu.org; Wed, 18 Oct 2023 18:30:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtF4C-00029t-Mc; Wed, 18 Oct 2023 18:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66619] [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: Wed, 18 Oct 2023 22:31:04 +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.16976682386137 (code B ref 66619); Wed, 18 Oct 2023 22:31:04 +0000 Received: (at 66619) by debbugs.gnu.org; 18 Oct 2023 22:30:38 +0000 Received: from localhost ([127.0.0.1]:34928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3k-0001ZE-QD for submit@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:37 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:57762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtF3Y-000136-RQ for 66619@debbugs.gnu.org; Wed, 18 Oct 2023 18:30:26 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3226cc3e324so6506968f8f.3 for <66619@debbugs.gnu.org>; Wed, 18 Oct 2023 15:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697668193; x=1698272993; 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=bJVThBWXI30ZkXJB6DTDOKZOEbI+ZpQWqDr80ieEgP9811VIgrGcpI+aYe0oFIrP1N 356B3l5n2iy8XDXd9ZmK1ZVVG8sizUG2IU4BaXjxhX015AfCSHyIk2ElyCqA4q1UnAPO /aaj62myBElhW8DgbVqUJnfsdnM5d+3zZfY26z7QM6nVT5Gp48UJIUYvGoCvA5DmBj3D N96aQD0gxqR0Rtb5dDM4Efy0U8ct6zrGjKDAdjDYmITF7U//3qJMQb8LvsBThStnMezs 8N5WbdpCPO4+euoOMXKmyHNflh3tjouj+91aQznPski9GIas1naWIxf2f15qukpYsHLN wJRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697668193; x=1698272993; 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=VFClMSbif2wmoLHni47R1+SVQHEJsshPQgQq13yarbucpzOhpnjvcV9Do2lJ8rN7EW bWVD7GOeaZ+Ye5SIpoONyvrEcuCiWkU9aCQIT5pDpIre/o1dvLEJX1GniSmn1tPd8dt+ Vl2cjvEG55+V7DQWarpvQckx9fd3XZgkqXpjhpq5P8UyBLPtljoD5jL4LOTYBfBPE3YX vaR8UbzPQ50NEz2ldGdBYYJwUIvV0mGiAJliSyguHistVAEexmS2H11opIC+CoFPE7bJ 32GrBEarh63du+xd3FgrZ/Y4OPgpO8ez1Ya+Z7ydg2flJ3WGXSJJxjTQMsB05rsUTkYN a4pg== X-Gm-Message-State: AOJu0YwFHb03LM7ORMmohFus37rxcdIM6pnl3vwmk6/WRpKRYK7rVwJB LFbexi9EO9iixmIPCppx9OnAw8fPbJ4Vkg== X-Google-Smtp-Source: AGHT+IGI5z6XUrXiKKpdnCFczIc7CtqfE2ovz3nJjhnhmdpuM364RyU3FxZv8vgU02V/FyA1RVEgXg== X-Received: by 2002:a5d:534e:0:b0:319:85e2:6972 with SMTP id t14-20020a5d534e000000b0031985e26972mr248337wrv.42.1697668192806; Wed, 18 Oct 2023 15:29:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:29:52 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 19 Oct 2023 02:28:58 +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 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-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")