all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 66619@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
	Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>
Subject: [bug#66619] [PATCH 05/19] gnu: go-gopkg-in-check-v1: Move to (gnu packages golang-check).
Date: Thu, 19 Oct 2023 02:28:58 +0100	[thread overview]
Message-ID: <2d0f36c510d18893cf00d824b2104bbf4cbcaafe.1697678664.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1697678664.git.sharlatanus@gmail.com>

* 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 <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;;
@@ -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





WARNING: multiple messages have this Message-ID (diff)
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 66627@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
	Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>
Subject: [bug#66627] [PATCH 05/19] gnu: go-gopkg-in-check-v1: Move to (gnu packages golang-check).
Date: Thu, 19 Oct 2023 10:33:46 +0100	[thread overview]
Message-ID: <2d0f36c510d18893cf00d824b2104bbf4cbcaafe.1697678664.git.sharlatanus@gmail.com> (raw)
Message-ID: <20231019093346.2y305ZQYxFtYowIQ8aTUowHzB8oA8Szs4uooJsQOcXE@z> (raw)
In-Reply-To: <cover.1697678664.git.sharlatanus@gmail.com>

* 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 <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;;
@@ -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





  parent reply	other threads:[~2023-10-18 22:31 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-19  1:27 [bug#66619] [PATCH 00/19] Split (gnu packages golang) part I Sharlatan Hellseher
2023-10-19  9:32 ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:28 ` [bug#66619] [PATCH 01/19] gnu: Add (gnu packages golang-check) module Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:28 ` [bug#66619] [PATCH 02/19] gnu: go-github-com-stretchr-testify: Move to (gnu packages golang-check) Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:28 ` [bug#66619] [PATCH 03/19] gnu: go-github-com-jacobsa-oglemock: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:28 ` [bug#66619] [PATCH 04/19] gnu: go-github-com-stretchr-testify: Remove lables Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:28 ` Sharlatan Hellseher [this message]
2023-10-19  9:33   ` [bug#66627] [PATCH 05/19] gnu: go-gopkg-in-check-v1: Move to (gnu packages golang-check) Sharlatan Hellseher
2023-10-19  1:28 ` [bug#66619] [PATCH 06/19] gnu: go-github-com-jacobsa-oglematchers: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 07/19] gnu: go-github-com-golangplus-testing: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 08/19] gnu: go-gopkg-in-go-playground-assert-v1: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 09/19] gnu: go-github-com-tdewolff-test: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 10/19] gnu: go-github-com-jacobsa-ogletest: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 11/19] gnu: go-github-com-google-gofuzz: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 12/19] gnu: go-github-com-cheekybits-is: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 13/19] gnu: go-github-com-frankban-quicktest: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 14/19] gnu: go-github-com-google-go-cmdtest: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 15/19] gnu: go-github-com-onsi-ginkgo: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 16/19] gnu: go-honnef-co-go-tools: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 17/19] gnu: go-golang-org-x-lint: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 18/19] gnu: go-golang-org-sql-mock: " Sharlatan Hellseher
2023-10-19  9:33   ` [bug#66627] " Sharlatan Hellseher
2023-10-19  1:29 ` [bug#66619] [PATCH 19/19] gnu: go-github-com-alecthomas-assert: " Sharlatan Hellseher
2023-10-19  9:34   ` [bug#66627] " Sharlatan Hellseher
2023-10-23  2:25 ` bug#66619: [PATCH 00/19] Split (gnu packages golang) part I Maxim Cournoyer
2023-10-27 17:37 ` [bug#66627] close Sharlatan Hellseher
2023-10-27 17:40 ` bug#66627: Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2d0f36c510d18893cf00d824b2104bbf4cbcaafe.1697678664.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=66619@debbugs.gnu.org \
    --cc=cox.katherine.e+guix@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.