[PATCH 00/19] Split (gnu packages golang) part I

  • Done
  • quality assurance status badge
Details
2 participants
  • Maxim Cournoyer
  • Sharlatan Hellseher
Owner
unassigned
Submitted by
Sharlatan Hellseher
Severity
normal
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:27
(address . guix-patches@gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cover.1697678664.git.sharlatanus@gmail.com
Hi Guix!

Here is a first portion to split monolithic (gnu packages golang) into logical
modules, following similar logic as python-*, perl-*, lisp-*.

Copiright headers are migrated based on the history of gnu/packages/golang.scm
file and includes all contributors introduced packages or modified it.

I've perform some checks applied to ensure the quality of the migration.

Modules which include packages from (gnu packages golang-check):
grep -r -l "go-honnef-co-go-tools\|go-github-com-alecthomas-assert\|go-github-com-cheekybits-is\|go-github-com-frankban-quicktest\|go-github-com-google-go-cmdtest\|go-github-com-google-gofuzz\|go-github-com-golangplus-testing\|go-github-com-jacobsa-oglematchers\|go-github-com-jacobsa-oglemock\|go-github-com-jacobsa-ogletest\|go-github-com-onsi-ginkgo\|go-github-com-stretchr-testify\|go-github-com-tdewolff-test\|go-gopkg-in-check-v1\|go-gopkg-in-go-playground-assert-v1\|go-golang-org-sql-mock\|go-golang-org-x-lint" . | grep ".*\.scm"
./gnu/packages/golang-check.scm
./gnu/packages/ipfs.scm
./gnu/packages/textutils.scm
./gnu/packages/bioinformatics.scm
./gnu/packages/file-systems.scm
./gnu/packages/mail.scm
./gnu/packages/version-control.scm
./gnu/packages/virtualization.scm
./gnu/packages/databases.scm
./gnu/packages/education.scm
./gnu/packages/irc.scm
./gnu/packages/golang.scm

Modules which use (gnu packages golang-check):
grep -r -l "golang-check" . | grep ".*\.scm"
./gnu/packages/golang-check.scm
./gnu/packages/ipfs.scm
./gnu/packages/textutils.scm
./gnu/packages/bioinformatics.scm
./gnu/packages/file-systems.scm
./gnu/packages/mail.scm
./gnu/packages/version-control.scm
./gnu/packages/databases.scm
./gnu/packages/education.scm
./gnu/packages/irc.scm
./gnu/packages/golang.scm

Make sure all packages from (gnu packages golang-check) are still buildable:
./pre-inst-env guix build go-honnef-co-go-tools go-github-com-alecthomas-assert go-github-com-cheekybits-is go-github-com-frankban-quicktest go-github-com-google-go-cmdtest go-github-com-google-gofuzz go-github-com-golangplus-testing go-github-com-jacobsa-oglematchers go-github-com-jacobsa-oglemock go-github-com-jacobsa-ogletest go-github-com-onsi-ginkgo go-github-com-stretchr-testify go-github-com-tdewolff-test go-gopkg-in-check-v1 go-gopkg-in-go-playground-assert-v1 go-golang-org-sql-mock go-golang-org-x-lint
/gnu/store/c2gvshavd6x8xkcynlmbmnmy9w84vvli-go-golang-org-x-lint-0.0.0-0.83fdc39
/gnu/store/cwj24gs2g2c4c782n68fwlm0h4q33s1s-go-golang-org-sql-mock-1.3.3-1.e98392b
/gnu/store/xwcw7yp5nr3f2h50p55a12h8irs0j00n-go-gopkg-in-go-playground-assert-v1-1.2.1
/gnu/store/2v2vbgkp1hwyp144xi55isc392y0z57p-go-gopkg-in-check-v1-1.0.0-20201130134442-10cb98267c6c
/gnu/store/3xh1mnammavbycsjwd7risfd0ab98m53-go-github-com-tdewolff-test-1.0.9
/gnu/store/3jdsa6yyr1h72zp2fg640nnnfv94zrdm-go-github-com-stretchr-testify-1.7.0
/gnu/store/0i4w0d0h76iy58c3776gbc6iwrk4vx7k-go-github-com-onsi-ginkgo-1.16.5
/gnu/store/qbglgcy9lcmp1p4drbfv676d79zsw327-go-github-com-jacobsa-ogletest-0.0.0-0.80d50a7
/gnu/store/51mj139r6nhy2niqpkb6shnrj1y62gdy-go-github-com-jacobsa-oglemock-0.0.0-0.e94d794
/gnu/store/jv9i8fnx2wl9ml7vcwq826bj2q8h86i3-go-github-com-jacobsa-oglematchers-0.0.0-0.141901e
/gnu/store/pj36c2s7wg5h1gwab0g4qjdiq8z5hrpg-go-github-com-golangplus-testing-1.0.0
/gnu/store/90gha098pb553wdhcz5jvr1if76wf9vh-go-github-com-google-gofuzz-0.0.0-0.fd52762
/gnu/store/4xp86zv0x3scfr4amlgcfpla2ij6iicx-go-github-com-google-go-cmdtest-0.4.0-0.55ab333
/gnu/store/vdxh36z49brbh7qqip946ymaldzi5czc-go-github-com-frankban-quicktest-1.11.1
/gnu/store/mvn4qvlpcmh71icwyazpr2ray7mwjsdh-go-github-com-cheekybits-is-0.0.0-0.68e9c06
/gnu/store/b11xr2041gxa6p4lcn3wf0caf71vlrxl-go-github-com-alecthomas-assert-0.0.1-1.405dbfe
/gnu/store/xklh3nny0svy5kbkv92si40fphqsz3m8-go-honnef-co-go-tools-0.3.3

Building the following 56 packages would ensure 166 dependent packages are rebuilt:
Some packages were broken before migration:
- go-github-com-charmbracelet-glamour
- chezmoi
- nncp

./pre-inst-env guix build go-github-com-bep-golibsass@0.7.0 gofumpt@0.4.0 govulncheck@0.0.0-20221229164908-ebf31f7dc3ef go-github-com-biogo-hts-csi@1.4.4 go-github-com-biogo-hts-tabix@1.4.4 go-github-com-biogo-hts-bgzf@1.4.4 go-github-com-biogo-hts-sam@1.4.4 go-github-com-biogo-hts-cram@1.4.4 go-github-com-biogo-biogo@1.0.4 go-github-com-biogo-hts-fai@1.4.4 go-github-com-cupcake-rdb@0.0.0-20161107195141-43ba34106c76 go-gopkg-in-mgo-v2@2.0.0-20190816093944-a6b53ec6cb22 sqls@0.2.18 go-github-com-hashicorp-hcl-v2@2.11.1 go-github-com-aws-aws-sdk-go@1.36.18 go-github-com-aws-sdk@1.35.2 trezord@2.0.33 hut@0.2.0 actionlint@1.6.23 go-github-com-couchbase-gomemcached@0.1.4 go-github-com-gomodule-redigo@1.8.8 gotypist@0.0.0-0.03f8618 kineto@0.0.0-20211105093215-857f8c97ebc5 r-biocdockermanager@1.11.0 go-github-com-docker-distribution@0.0.0-0.325b080 go-gitlab.com-shackra-goimapnotify@2.3.7 browserpass-native@3.1.0 edirect@13.3.20200128 miniflux@2.0.46 nsq@1.2.1 gocryptfs@2.4.0 gx@0.14.3 gx-go@1.9.0 exercism@3.1.0 hebcal@5.3.0-0.2384bb8 bitmask@0.21.11 go-github-com-jcmturner-rpc@2.0.3 fdroidcl@0.7.0 go-github-com-coreos-go-oidc@2.2.1 aws-vault@6.6.2 clipman@1.6.1 go-github-com-google-go-jsonnet@0.18.0 chathistorysync@0.2.0 csvdiff@1.4.0 lfs-s3@0.1.5 aerc@0.15.2 gopls@0.12.0 gojq@0.12.11 go-github-com-itchyny-gojq@0.12.11 kiln@0.4.0 go-github-com-dhowett-go-plist@0.0.0-1.1454fab emacs-ghq@0.2.0 kappanhang@1.3 go-ipfs@0.14.0
/gnu/store/l3p4la4kn3s53mm4gizlzswqqvkpyvkx-go-ipfs-0.14.0
/gnu/store/803llahlqffbpl2q75xvrazhdxfdb5m0-kappanhang-1.3
/gnu/store/a6d535sj33n8jkp4wvj7a9ck50238qiq-emacs-ghq-0.2.0
/gnu/store/zr8w2a0mcc469knd0rxla441i42i2kfg-go-github-com-dhowett-go-plist-0.0.0-1.1454fab
/gnu/store/adf89z3yzrkljwcy3a80qdybi7103vx1-kiln-0.4.0
/gnu/store/6r2mjylicc6dfh1jdl4f2vvpfbzbmdy3-go-github-com-itchyny-gojq-0.12.11
/gnu/store/gnbdxj8qk7q8smbmqavzhwqpyfwl3n8d-gojq-0.12.11
/gnu/store/s5g3xcgqyxr18igiv3i00lnv1ria5jsb-gopls-0.12.0
/gnu/store/64g5897p79rqfi4jahgaxpphqwg4c6j5-aerc-0.15.2
/gnu/store/8clyspa8878cw7frhjmszxzimirc355c-lfs-s3-0.1.5
/gnu/store/cwnp66v4lgdh91gpbj24qsh0z083vcsp-csvdiff-1.4.0
/gnu/store/shaxqrxishzlkn9lhrjrxh52am6i2sfr-chathistorysync-0.2.0
/gnu/store/44i5ipyz7h6f2ssah1wh39fhlhdig8h0-go-github-com-google-go-jsonnet-0.18.0
/gnu/store/8ifhlgjwap15x32lvcyjrcpx8v7fs8hj-clipman-1.6.1
/gnu/store/1qgac23yw0bz8c7ih28chfk314nrwgwc-aws-vault-6.6.2
/gnu/store/ljhsalwrrn0blaj87d0ni1cn28vg8lkg-go-github-com-coreos-go-oidc-2.2.1
/gnu/store/cx3c9vlgq05dlgpkbq4w9mk38ajibbz7-fdroidcl-0.7.0
/gnu/store/g1kz78vbbk7rylgkyii4vvgiing5lzm8-go-github-com-jcmturner-rpc-2.0.3
/gnu/store/sajbpgdv43gpiyh9wm9rvk0bk0hg36yy-bitmask-0.21.11
/gnu/store/dvlqfvsa6g161ckzcxv36v2amkrvgapa-hebcal-5.3.0-0.2384bb8
/gnu/store/plipaafwkz49hq7lm93pha31hm1r9gf2-exercism-3.1.0
/gnu/store/svx0v7ia5w9mxz9hack9cy36vxcx23hr-gx-go-1.9.0
/gnu/store/8g14hhra5whiq138hvqkjk9b97g5bmd3-gx-0.14.3
/gnu/store/9cb0ky0mys4hafalkmxji76fky67r8kr-gocryptfs-2.4.0
/gnu/store/mx1sp2sq472n2p0fcyvszxzqjp13w86g-nsq-1.2.1
/gnu/store/cf903c1sw8m6sjilnzzfjwch5ivk1n27-miniflux-2.0.46
/gnu/store/m2r30pcjikgx47z0xjdmrprd72l78ncc-edirect-13.3.20200128
/gnu/store/yzhsdgsj2qbk6fbw4mirpqa00db2xk95-browserpass-native-3.1.0
/gnu/store/cl9b5xkmn349b47hkyy4a9paydxq8013-go-gitlab.com-shackra-goimapnotify-2.3.7
/gnu/store/ml3pk2cr9gar3lpibzs8rhxk6g2g19r6-go-github-com-docker-distribution-0.0.0-0.325b080
/gnu/store/w1kp2w3n88rwwpabl1fzq6j5brmrslg2-r-biocdockermanager-1.11.0
/gnu/store/bz0nzf3jz8r5sqpi886khd6r05fqzj9c-kineto-0.0.0-20211105093215-857f8c97ebc5
/gnu/store/17hym66w5yx76gpidz9y78bn2fv1ydd4-gotypist-0.0.0-0.03f8618
/gnu/store/i8wibhrww13z8kcscy5ph8s0rgi51zwd-go-github-com-gomodule-redigo-1.8.8
/gnu/store/k3zbhyb8qw0j5vn9h5n9jkqkqswbs1i6-go-github-com-couchbase-gomemcached-0.1.4
/gnu/store/hl4yk4f7bhw3pbrqab4a1s0n1dbafy0l-actionlint-1.6.23
/gnu/store/5rfm1klffmk4d2dyrysmc4i4khczx88c-hut-0.2.0
/gnu/store/l08wbfl3m25nalafrm8qvkwmx4hc3gi6-trezord-2.0.33
/gnu/store/j8rakyd65vqbhaw2kvnd10yhfv5yj8wz-go-github-com-aws-sdk-1.35.2
/gnu/store/gfkmh8ka75j8fvs3q6vkbz7nz4z4q5ad-go-github-com-aws-aws-sdk-go-1.36.18
/gnu/store/4pxr0imrycfav92i3n69p8n4fcvjz9gv-go-github-com-hashicorp-hcl-v2-2.11.1
/gnu/store/9psnki00ymywbrzdailbsima0y6zvk15-sqls-0.2.18
/gnu/store/g82cx6wnym7k6l1bw7rmdf8amfgpqb45-go-gopkg-in-mgo-v2-2.0.0-20190816093944-a6b53ec6cb22
/gnu/store/7i4lf91z20mi6gzv48jrrmgx5qvc7zxh-go-github-com-cupcake-rdb-0.0.0-20161107195141-43ba34106c76
/gnu/store/n9ndb27prq99g53i97804w90xlkibcw2-go-github-com-biogo-hts-fai-1.4.4
/gnu/store/4lm6vcbmm8qqpfsjaywdrjcnmw245s5i-go-github-com-biogo-biogo-1.0.4
/gnu/store/5sdr0b4zfl57f9x6y7vdp9s6gn3wclk9-go-github-com-biogo-hts-cram-1.4.4
/gnu/store/j0y2jmf3w90acn0cd47c83l4bqyhd5sn-go-github-com-biogo-hts-sam-1.4.4
/gnu/store/6qx0hj2zv9sxrbypwcsqj7dm6rlnkjqj-go-github-com-biogo-hts-bgzf-1.4.4
/gnu/store/qmi2avihdbxyl3kmzjy81x5fj8vychw7-go-github-com-biogo-hts-tabix-1.4.4
/gnu/store/47qdil5w1lmkh3s17rfg2zkfgr3qr2j6-go-github-com-biogo-hts-csi-1.4.4
/gnu/store/353v4vxjx30yqpq9kxgf3fxmyfr9g6mc-govulncheck-0.0.0-20221229164908-ebf31f7dc3ef
/gnu/store/gxpjazj7hk4ih5rxbx2qkhcsabklm8sx-gofumpt-0.4.0
/gnu/store/s7fxah4mgzr20a171p12slb10xzwplqn-go-github-com-bep-golibsass-0.7.0

Sharlatan Hellseher (19):
gnu: Add (gnu packages golang-check) module.
gnu: go-github-com-stretchr-testify: Move to (gnu packages golang-check).
gnu: go-github-com-jacobsa-oglemock: Move to (gnu packages golang-check)
gnu: go-github-com-stretchr-testify: Remove lables.
gnu: go-gopkg-in-check-v1: Move to (gnu packages golang-check).
gnu: go-github-com-jacobsa-oglematchers: Move to (gnu packages golang-check).
gnu: go-github-com-golangplus-testing: Move to (gnu packages golang-check).
gnu: go-gopkg-in-go-playground-assert-v1: Move to (gnu packages golang-check).
gnu: go-github-com-tdewolff-test: Move to (gnu packages golang-check).
gnu: go-github-com-jacobsa-ogletest: Move to (gnu packages golang-check).
gnu: go-github-com-google-gofuzz: Move to (gnu packages golang-check).
gnu: go-github-com-cheekybits-is: Move to (gnu packages golang-check).
gnu: go-github-com-frankban-quicktest: Move to (gnu packages golang-check).
gnu: go-github-com-google-go-cmdtest: Move to (gnu packages golang-check).
gnu: go-github-com-onsi-ginkgo: Move to (gnu packages golang-check).
gnu: go-honnef-co-go-tools: Move to (gnu packages golang-check).
gnu: go-golang-org-x-lint: Move to (gnu packages golang-check).
gnu: go-golang-org-sql-mock: Move to (gnu packages golang-check).
gnu: go-github-com-alecthomas-assert: Move to (gnu packages golang-check).

gnu/local.mk | 1 +
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/databases.scm | 1 +
gnu/packages/education.scm | 1 +
gnu/packages/file-systems.scm | 1 +
gnu/packages/golang-check.scm | 555 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 485 +--------------------------
gnu/packages/ipfs.scm | 1 +
gnu/packages/irc.scm | 1 +
gnu/packages/mail.scm | 1 +
gnu/packages/textutils.scm | 1 +
gnu/packages/version-control.scm | 1 +
12 files changed, 566 insertions(+), 484 deletions(-)
create mode 100644 gnu/packages/golang-check.scm


base-commit: 7823c6504082a0cfbd98beb301e041fb8bc4e44e
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 1/1] etc: Add guix-health.sh
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cf698536c6393032274c6d8539f366acaa036e98.1697156963.git.sharlatanus@gmail.com
* etc/guix-health.sh: New file.
---
etc/guix-health.sh | 145 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 145 insertions(+)
create mode 100755 etc/guix-health.sh

Toggle diff (153 lines)
diff --git a/etc/guix-health.sh b/etc/guix-health.sh
new file mode 100755
index 0000000000..9078d52ce6
--- /dev/null
+++ b/etc/guix-health.sh
@@ -0,0 +1,145 @@
+#!/bin/sh
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2023 sharlatan <sharlatanus@gmail.com>
+
+# This file is part of GNU Guix.
+#
+# GNU Guix is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Guix is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+# We require Bash but for portability we'd rather not use /bin/bash or
+# /usr/bin/env in the shebang, hence this hack.
+
+## Commentary:
+#
+# General purpose check script which may be used as report during diagnostics of
+# issues with running system in general and Guix in particularly.
+
+## Code:
+
+if [ "x$BASH_VERSION" = "x" ]
+then
+ exec bash "$0" "$@"
+fi
+
+set -eo pipefail
+
+[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
+
+REQUIRE=(
+ "herd"
+ "stat"
+ "grep"
+ "cat"
+)
+
+PAS=$'[ \033[32;1mPASS\033[0m ] '
+ERR=$'[ \033[31;1mFAIL\033[0m ] '
+WAR=$'[ \033[33;1mWARN\033[0m ] '
+INF="[ INFO ] "
+
+DEBUG=0
+
+# Map of all vital predictable files required to diagnose health condition of
+# the guix-daemon.
+declare -A GUIX_FILE
+GUIX_FILE=(
+ [socket]="/var/guix/daemon-socket/socket"
+ [configuration]="/run/current-system/configuration.scm"
+)
+
+# ------------------------------------------------------------------------------
+#+UTILITIES
+
+_err()
+{ # All errors go to stderr.
+ printf "[%s]: %s\n" "$(date +%s.%3N)" "$1"
+}
+
+_msg()
+{ # Default message to stdout.
+ printf "[%s]: %s\n" "$(date +%s.%3N)" "$1"
+}
+
+_debug()
+{
+ if [ "${DEBUG}" = '1' ]; then
+ printf "[%s]: %s\n" "$(date +%s.%3N)" "$1"
+ fi
+}
+
+die()
+{
+ _err "${ERR}$*"
+ exit 1
+}
+
+chck_require()
+{ # Check that every required command is available.
+ declare -a warn
+ local c
+
+ _debug "--- [ ${FUNCNAME[0]} ] ---"
+
+ for c in "$@"; do
+ command -v "$c" &>/dev/null || warn+=("$c")
+ done
+
+ [ "${#warn}" -ne 0 ] && die "Missing commands: ${warn[*]}."
+
+ _msg "${PAS}verification of required commands completed"
+}
+
+# ------------------------------------------------------------------------------
+#+CHECKS :: Collection of grouped check to validate Guix system health.
+
+chck_daemon()
+{ # Basic assumptions and check list to show what's going on with guix-daemon,
+ # some of the checks can't be performed if daemon is not running (e.g guix
+ # system shepherd-graph)
+
+ local guix_daemon_status
+
+ _debug "--- [ ${FUNCNAME[0]} ] ---"
+
+ guix_daemon_status="$(herd status | grep guix-daemon | cut -d' ' -f2)"
+
+ if [ "$(stat --format=%F ${GUIX_FILE[socket]})" == 'socket' ]
+ then
+ _msg "${PAS}Guix socket file is present in ${GUIX_FILE[socket]}"
+ fi
+
+ if [ "$guix_daemon_status" == "+" ]
+ then
+ _msg "${PAS}guix-daemon is running"
+ elif [ "$guix_daemon_status" == "-" ]
+ then
+ _msg "${WAR}guix-daemon is stopped"
+ fi
+
+ if grep guix-daemon "${GUIX_FILE[configuration]}" &>/dev/null
+ then
+ _msg "${PAS}guix-daemon is listed in current system config"
+ else
+ _msg "${WAR}guix-daemon is not listed in current system config"
+ fi
+}
+
+main()
+{
+ chck_require
+ chck_daemon
+ # XXX: Add more, event more!
+}
+
+main "$@"
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 01/19] gnu: Add (gnu packages golang-check) module.
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1d1d15118cabce4efe4e06602daf39b5ed7a046e.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-check.scm scope.
---
gnu/local.mk | 1 +
gnu/packages/golang-check.scm | 38 +++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
create mode 100644 gnu/packages/golang-check.scm

Toggle diff (58 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index daacd786a7..5f50801073 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -302,6 +302,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gnu-pw-mgr.scm \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
+ %D%/packages/golang-check.scm \
%D%/packages/gperf.scm \
%D%/packages/gpodder.scm \
%D%/packages/gps.scm \
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
new file mode 100644
index 0000000000..160fdff6a6
--- /dev/null
+++ b/gnu/packages/golang-check.scm
@@ -0,0 +1,38 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(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 git-download)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages golang))
+
+;;; Commentary:
+;;;
+;;; Golang packages to unit-test, mock, assert, lint processes for Golang itself.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
+;;;
+;;; 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
+;;; functionality or similar names.
+;;;
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 02/19] gnu: go-github-com-stretchr-testify: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ca0690a045874892ccb762067eea530133a101c7.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-stretchr-testify): Move from
here...
* gnu/packages/golang-check.scm: ...to here.

* gnu/packages/databases.scm: Add (gnu packages golang-check) module.
* gnu/packages/education.scm: As above...
* gnu/packages/ipfs.scm: As above...
* gnu/packages/irc.scm: As above...
* gnu/packages/mail.scm: As above...
* gnu/packages/textutils.scm: As above...
* gnu/packages/version-control.scm: As above...
---
gnu/packages/databases.scm | 1 +
gnu/packages/education.scm | 1 +
gnu/packages/golang-check.scm | 39 ++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 37 +-----------------------------
gnu/packages/ipfs.scm | 1 +
gnu/packages/irc.scm | 1 +
gnu/packages/mail.scm | 1 +
gnu/packages/textutils.scm | 1 +
gnu/packages/version-control.scm | 1 +
9 files changed, 47 insertions(+), 36 deletions(-)

Toggle diff (196 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index b5077583c3..e25b88941a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -106,6 +106,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 61fc9945fa..2fd1d4a632 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages education)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 160fdff6a6..c6b2f3f99e 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1,4 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +34,42 @@ (define-module (gnu packages golang-check)
;;;
;;; Code:
+(define-public go-github-com-stretchr-testify
+ (package
+ (name "go-github-com-stretchr-testify")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stretchr/testify")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/stretchr/testify"))
+ (propagated-inputs
+ `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew)
+ ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib)
+ ("github.com/stretchr/objx" ,go-github-com-stretchr-objx)
+ ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3)))
+ (home-page "https://github.com/stretchr/testify")
+ (synopsis "Go helper library for tests and invariant checking")
+ (description "This package provide many tools for testifying that your
+code will behave as you intend.
+
+Features include:
+@itemize
+@item Easy assertions
+@item Mocking
+@item HTTP response trapping
+@item Testing suite interfaces and functions.
+@end itemize")
+ (license license:expat)))
+
;;;
;;; 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 0277265375..9a7f60fc0a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -78,6 +78,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages mp3)
@@ -4588,42 +4589,6 @@ (define-public go-github-com-stretchr-objx
slices, JSON and other data.")
(license license:expat)))
-(define-public go-github-com-stretchr-testify
- (package
- (name "go-github-com-stretchr-testify")
- (version "1.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/stretchr/testify")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/stretchr/testify"))
- (propagated-inputs
- `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew)
- ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib)
- ("github.com/stretchr/objx" ,go-github-com-stretchr-objx)
- ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3)))
- (home-page "https://github.com/stretchr/testify")
- (synopsis "Go helper library for tests and invariant checking")
- (description "This package provide many tools for testifying that your
-code will behave as you intend.
-
-Features include:
-@itemize
-@item Easy assertions
-@item Mocking
-@item HTTP response trapping
-@item Testing suite interfaces and functions.
-@end itemize")
- (license license:expat)))
-
(define go-github-com-stretchr-testify-bootstrap
(package
(inherit go-github-com-stretchr-testify)
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 1bad48de4c..ac12aea002 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -29,6 +29,7 @@ (define-module (gnu packages ipfs)
#:use-module (guix download)
#:use-module (guix build-system go)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
#:use-module (gnu packages syncthing))
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 9d9e01a280..46961ccb7e 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages irc)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index be458a2d92..709674bf59 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -108,6 +108,7 @@ (define-module (gnu packages mail)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages gtk)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index ddeb979334..41a34b6c4e 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -63,6 +63,7 @@ (define-module (gnu packages textutils)
#:use-module (gnu packages compression)
#:use-module (gnu packages gcc)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages gettext)
#:use-module (gnu packages java)
#:use-module (gnu packages ncurses)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 04b52f2a85..76fa8ef5d0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -104,6 +104,7 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 03/19] gnu: go-github-com-jacobsa-oglemock: Move to (gnu packages golang-check)
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f6fceeac36695dcefa272189823aa5a453244031.1697678664.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (103 lines)
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 <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;;
;;; 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
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 04/19] gnu: go-github-com-stretchr-testify: Remove lables.
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ef322497f6dfadcf52e65a15c288fc5436978cd9.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-stretchr-testify): Remove
input lables.
---
gnu/packages/golang-check.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 7ca3cf5d64..46a72e4768 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -83,10 +83,10 @@ (define-public go-github-com-stretchr-testify
(arguments
'(#:import-path "github.com/stretchr/testify"))
(propagated-inputs
- `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew)
- ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib)
- ("github.com/stretchr/objx" ,go-github-com-stretchr-objx)
- ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3)))
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib
+ go-github-com-stretchr-objx
+ go-gopkg-in-yaml-v3))
(home-page "https://github.com/stretchr/testify")
(synopsis "Go helper library for tests and invariant checking")
(description "This package provide many tools for testifying that your
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 05/19] gnu: go-gopkg-in-check-v1: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2d0f36c510d18893cf00d824b2104bbf4cbcaafe.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(-)

Toggle diff (119 lines)
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
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:28
[PATCH 06/19] gnu: go-github-com-jacobsa-oglematchers: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5b418757f452ab9df4854027fa4ee0d6a6482135.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jacobsa-oglematchers): Move
from here...
* gnu/packages/golang-check.scm: ... to here.
---
gnu/packages/golang-check.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 81583a5ac7..8c6bf03f74 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -38,6 +38,34 @@ (define-module (gnu packages golang-check)
;;;
;;; Code:
+(define-public go-github-com-jacobsa-oglematchers
+ (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5")
+ (revision "0"))
+ (package
+ (name "go-github-com-jacobsa-oglematchers")
+ (version (git-version "0.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jacobsa/oglematchers")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jacobsa/oglematchers"
+ ;; break loop with with go-github-com-jacobsa-ogletest
+ #:tests? #f))
+ (home-page "https://github.com/jacobsa/oglematchers")
+ (synopsis "Matchers for Go testing framework")
+ (description
+ "Package oglematchers provides a set of matchers useful in a testing or mocking
+framework. These matchers are inspired by and mostly compatible with Google
+Test for C++ and Google JS Test.")
+ (license license:asl2.0))))
+
(define-public go-github-com-jacobsa-oglemock
(let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 794e5f0f49..afc1a9bd30 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1311,34 +1311,6 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto
not included in the Go standard library.")
(license license:asl2.0))))
-(define-public go-github-com-jacobsa-oglematchers
- (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5")
- (revision "0"))
- (package
- (name "go-github-com-jacobsa-oglematchers")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jacobsa/oglematchers")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jacobsa/oglematchers"
- ;; break loop with with go-github-com-jacobsa-ogletest
- #:tests? #f))
- (home-page "https://github.com/jacobsa/oglematchers")
- (synopsis "Matchers for Go testing framework")
- (description
- "Package oglematchers provides a set of matchers useful in a testing or mocking
-framework. These matchers are inspired by and mostly compatible with Google
-Test for C++ and Google JS Test.")
- (license license:asl2.0))))
-
(define-public go-github-com-jacobsa-ogletest
(let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 08/19] gnu: go-gopkg-in-go-playground-assert-v1: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
92c77923ee6650a70e9582e8da7329590a0b4c42.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-gopkg-in-go-playground-assert-v1):
Move from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 24 insertions(+), 23 deletions(-)

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 414423a5ef..4b7ca74cc2 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;;
@@ -189,6 +190,29 @@ (define-public go-gopkg-in-check-v1
(description "This package provides a test library for the Go language.")
(license license:bsd-2)))
+(define-public go-gopkg-in-go-playground-assert-v1
+ (package
+ (name "go-gopkg-in-go-playground-assert-v1")
+ (version "1.2.1")
+ (home-page "https://github.com/go-playground/assert")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "gopkg.in/go-playground/assert.v1"))
+ (synopsis "Basic assertion library used alongside native Go testing")
+ (description
+ "This package provides basic assertions along with building blocks for
+custom assertions to be used alongside native Go testing.")
+ (license license:expat)))
+
;;;
;;; 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 cfd7fb73ad..c3cb30c344 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3064,29 +3064,6 @@ (define-public go-github.com-jessevdk-go-flags
(home-page "https://github.com/jessevdk/go-flags")
(license license:bsd-3)))
-(define-public go-gopkg-in-go-playground-assert-v1
- (package
- (name "go-gopkg-in-go-playground-assert-v1")
- (version "1.2.1")
- (home-page "https://github.com/go-playground/assert")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "gopkg.in/go-playground/assert.v1"))
- (synopsis "Basic assertion library used alongside native Go testing")
- (description
- "This package provides basic assertions along with building blocks for
-custom assertions to be used alongside native Go testing.")
- (license license:expat)))
-
(define-public go-github-com-go-playground-locales
(package
(name "go-github-com-go-playground-locales")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 09/19] gnu: go-github-com-tdewolff-test: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1d697bcf2916a0c12517ce8e8b2aea4482b96a52.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-tdewolff-test):
Move from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 25 insertions(+), 23 deletions(-)

Toggle diff (79 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 4b7ca74cc2..fe442bdb8b 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -157,6 +158,30 @@ (define-public go-github-com-stretchr-testify
@end itemize")
(license license:expat)))
+(define-public go-github-com-tdewolff-test
+ (package
+ (name "go-github-com-tdewolff-test")
+ (version "1.0.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/test")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/tdewolff/test"))
+ (home-page "https://github.com/tdewolff/test")
+ (synopsis "Go test helper functions")
+ (description
+ "This package implements a few functions that are useful for io testing,
+such as readers and writers that fail after N consecutive reads/writes.")
+ (license license:expat)))
+
(define-public go-gopkg-in-check-v1
(package
(name "go-gopkg-in-check-v1")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c3cb30c344..effe3e7854 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3646,29 +3646,6 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
-(define-public go-github-com-tdewolff-test
- (package
- (name "go-github-com-tdewolff-test")
- (version "1.0.9")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/test")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/test"))
- (home-page "https://github.com/tdewolff/test")
- (synopsis "Go test helper functions")
- (description
- "This package implements a few functions that are useful for io testing,
-such as readers and writers that fail after N consecutive reads/writes.")
- (license license:expat)))
-
(define-public go-github-com-tj-docopt
(package
(name "go-github-com-tj-docopt")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 07/19] gnu: go-github-com-golangplus-testing: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5ffdd4424a9bbdf89b213601eaa5c386cdef08ad.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-golangplus-testing): Move from
here...
* gnu/packages/golang-check.scm: ... to here.
---
gnu/packages/golang-check.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 22 ----------------------
2 files changed, 24 insertions(+), 22 deletions(-)

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 8c6bf03f74..414423a5ef 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -2,6 +2,7 @@
;;; 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 © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
@@ -38,6 +39,29 @@ (define-module (gnu packages golang-check)
;;;
;;; Code:
+(define-public go-github-com-golangplus-testing
+ (package
+ (name "go-github-com-golangplus-testing")
+ (version "1.0.0")
+ (home-page "https://github.com/golangplus/testing")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/golangplus/testing"))
+ (propagated-inputs
+ (list go-github-com-golangplus-fmt))
+ (synopsis "Additions to Go's standard testing package")
+ (description "This package provides additions to Go's stdlib testing.")
+ (license license:bsd-3)))
+
(define-public go-github-com-jacobsa-oglematchers
(let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index afc1a9bd30..cfd7fb73ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3006,28 +3006,6 @@ (define-public go-github-com-daviddengcn-go-colortext
;; dual-licensed
(license (list license:bsd-3 license:expat))))
-(define-public go-github-com-golangplus-testing
- (package
- (name "go-github-com-golangplus-testing")
- (version "1.0.0")
- (home-page "https://github.com/golangplus/testing")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/golangplus/testing"))
- (propagated-inputs
- (list go-github-com-golangplus-fmt))
- (synopsis "Additions to Go's standard testing package")
- (description "This package provides additions to Go's stdlib testing.")
- (license license:bsd-3)))
-
(define-public go-github-com-leodido-go-urn
(package
(name "go-github-com-leodido-go-urn")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 10/19] gnu: go-github-com-jacobsa-ogletest: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
9566ebdb5003bc044393ef850c369d2447479629.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-jacobsa-ogletest): Move
from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 36 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 35 ----------------------------------
2 files changed, 36 insertions(+), 35 deletions(-)

Toggle diff (95 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index fe442bdb8b..f904e8b02c 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -122,6 +122,42 @@ (define-public go-github-com-jacobsa-oglemock
"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"))
+ (package
+ (name "go-github-com-jacobsa-ogletest")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jacobsa/ogletest")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jacobsa/ogletest"
+ ;; These tests should be made working
+ #:tests? #f))
+ (native-inputs
+ (list go-github-com-jacobsa-oglematchers
+ go-github-com-jacobsa-oglemock
+ go-github-com-jacobsa-reqtrace
+ go-golang-org-x-net))
+ (home-page "https://github.com/jacobsa/ogletest")
+ (synopsis "Expressive unit tests")
+ (description
+ "Package ogletest provides a framework for writing expressive unit tests. It
+integrates with the builtin testing package, so it works with the gotest
+command. Unlike the testing package which offers only basic capabilities for
+signalling failures, it offers ways to express expectations and get nice failure
+messages automatically.")
+ (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 effe3e7854..04751b6a79 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1311,41 +1311,6 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto
not included in the Go standard library.")
(license license:asl2.0))))
-(define-public go-github-com-jacobsa-ogletest
- (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292")
- (revision "0"))
- (package
- (name "go-github-com-jacobsa-ogletest")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jacobsa/ogletest")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jacobsa/ogletest"
- ;; These tests should be made working
- #:tests? #f))
- (native-inputs (list
- go-github-com-jacobsa-oglematchers
- go-github-com-jacobsa-oglemock
- go-github-com-jacobsa-reqtrace
- go-golang-org-x-net))
- (home-page "https://github.com/jacobsa/ogletest")
- (synopsis "Expressive unit tests")
- (description
- "Package ogletest provides a framework for writing expressive unit tests. It
-integrates with the builtin testing package, so it works with the gotest
-command. Unlike the testing package which offers only basic capabilities for
-signalling failures, it offers ways to express expectations and get nice failure
-messages automatically.")
- (license license:asl2.0))))
-
(define-public go-github-com-jacobsa-reqtrace
(let ((commit "245c9e0234cb2ad542483a336324e982f1a22934")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 11/19] gnu: go-github-com-google-gofuzz: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c75d5fe89ed58542a3654e0646674c0c64e82eea.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-google-gofuzz): Move from
here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
2 files changed, 25 insertions(+), 25 deletions(-)

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index f904e8b02c..9fdb5b0d9e 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -41,6 +41,31 @@ (define-module (gnu packages golang-check)
;;;
;;; Code:
+(define-public go-github-com-google-gofuzz
+ (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382")
+ (revision "0"))
+ (package
+ (name "go-github-com-google-gofuzz")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/gofuzz")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/google/gofuzz"))
+ (home-page "https://github.com/google/gofuzz")
+ (synopsis "Fuzz testing library for Go")
+ (description "Gofuzz is a library for populationg Go objects with random
+values for the purpose of fuzz testing.")
+ (license license:asl2.0))))
+
(define-public go-github-com-golangplus-testing
(package
(name "go-github-com-golangplus-testing")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 04751b6a79..1e78bfd5bd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4655,31 +4655,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-google-gofuzz
- (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382")
- (revision "0"))
- (package
- (name "go-github-com-google-gofuzz")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/gofuzz")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/google/gofuzz"))
- (home-page "https://github.com/google/gofuzz")
- (synopsis "Fuzz testing library for Go")
- (description "Gofuzz is a library for populationg Go objects with random
-values for the purpose of fuzz testing.")
- (license license:asl2.0))))
-
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 12/19] gnu: go-github-com-cheekybits-is: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
32f98288de65f7086dc63f7097bed954811320e7.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-cheekybits-is): Move from
here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 32 --------------------------------
2 files changed, 33 insertions(+), 32 deletions(-)

Toggle diff (94 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 9fdb5b0d9e..d10eced626 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; 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>
@@ -41,6 +42,38 @@ (define-module (gnu packages golang-check)
;;;
;;; Code:
+(define-public go-github-com-cheekybits-is
+ (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
+ (revision "0"))
+ (package
+ (name "go-github-com-cheekybits-is")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cheekybits/is")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/cheekybits/is"))
+ (home-page "https://github.com/cheekybits/is")
+ (synopsis "Mini testing helper for Go")
+ (description "A mini testing helper for Go.
+
+@itemize
+@item It has a simple interface (@command{is.OK} and @command{is.Equal}).
+@item It plugs into existing Go toolchain (uses @command{testing.T}).
+@item It's obvious for newcomers.
+@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers
+- because testing panics is ugly.
+@end itemize\n")
+ (license license:expat))))
+
(define-public go-github-com-google-gofuzz
(let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1e78bfd5bd..d43b43f905 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6806,38 +6806,6 @@ (define-public go-github-com-whyrusleeping-tar-utils
(description "Tar utilities extracted from @command{go-ipfs} codebase.")
(license license:expat))))
-(define-public go-github-com-cheekybits-is
- (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
- (revision "0"))
- (package
- (name "go-github-com-cheekybits-is")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cheekybits/is")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/cheekybits/is"))
- (home-page "https://github.com/cheekybits/is")
- (synopsis "Mini testing helper for Go")
- (description "A mini testing helper for Go.
-
-@itemize
-@item It has a simple interface (@command{is.OK} and @command{is.Equal}).
-@item It plugs into existing Go toolchain (uses @command{testing.T}).
-@item It's obvious for newcomers.
-@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers
-- because testing panics is ugly.
-@end itemize\n")
- (license license:expat))))
-
(define-public go-github-com-sabhiram-go-gitignore
(let ((commit "525f6e181f062064d83887ed2530e3b1ba0bc95a")
(revision "1"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 13/19] gnu: go-github-com-frankban-quicktest: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
27ff2067679cee97867719e8f72dad3eb4569cdc.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-frankban-quicktest): Move
from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (84 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index d10eced626..82bcfcd28c 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
@@ -74,6 +75,32 @@ (define-public go-github-com-cheekybits-is
@end itemize\n")
(license license:expat))))
+(define-public go-github-com-frankban-quicktest
+ (package
+ (name "go-github-com-frankban-quicktest")
+ (version "1.11.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/frankban/quicktest")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/frankban/quicktest"))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty))
+ (home-page "https://github.com/frankban/quicktest")
+ (synopsis "Quick helpers for testing Go applications")
+ (description
+ "Package quicktest provides a collection of Go helpers for writing
+tests.")
+ (license license:expat)))
+
(define-public go-github-com-google-gofuzz
(let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d43b43f905..8860ec50fe 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10799,32 +10799,6 @@ (define-public go-github-com-gologme-log
additions.")
(license license:bsd-3))))
-(define-public go-github-com-frankban-quicktest
- (package
- (name "go-github-com-frankban-quicktest")
- (version "1.11.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/frankban/quicktest")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/frankban/quicktest"))
- (propagated-inputs
- (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty))
- (home-page "https://github.com/frankban/quicktest")
- (synopsis "Quick helpers for testing Go applications")
- (description
- "Package quicktest provides a collection of Go helpers for writing
-tests.")
- (license license:expat)))
-
(define-public go-github-com-bep-golibsass
(package
(name "go-github-com-bep-golibsass")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 14/19] gnu: go-github-com-google-go-cmdtest: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
83848cf1ac84ad864cf014e0b9ccf8355da89c6a.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-google-go-cmdtest): Move
from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 29 -----------------------------
2 files changed, 31 insertions(+), 29 deletions(-)

Toggle diff (91 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 82bcfcd28c..eb4f085bbf 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -101,6 +102,36 @@ (define-public go-github-com-frankban-quicktest
tests.")
(license license:expat)))
+(define-public go-github-com-google-go-cmdtest
+ (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5")
+ (revision "0"))
+ (package
+ (name "go-github-com-google-go-cmdtest")
+ (version (git-version "0.4.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/go-cmdtest")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/google/go-cmdtest"))
+ (propagated-inputs
+ (list go-github-com-google-renameio go-github-com-google-go-cmp-cmp))
+ (home-page "https://github.com/google/go-cmdtest")
+ (synopsis "Testing for your CLI")
+ (description
+ "The cmdtest package simplifies testing of command-line interfaces. It
+provides a simple, cross-platform, shell-like language to express command
+execution. It can compare actual output with the expected output, and can
+also update a file with new \"golden\" output that is deemed correct.")
+ (license license:asl2.0))))
+
(define-public go-github-com-google-gofuzz
(let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8860ec50fe..5abe17bf3e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12860,35 +12860,6 @@ (define-public go-github-com-google-go-jsonnet
implementation.")
(license license:asl2.0)))
-(define-public go-github-com-google-go-cmdtest
- (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5")
- (revision "0"))
- (package
- (name "go-github-com-google-go-cmdtest")
- (version (git-version "0.4.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/go-cmdtest")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/google/go-cmdtest"))
- (propagated-inputs (list go-github-com-google-renameio
- go-github-com-google-go-cmp-cmp))
- (home-page "https://github.com/google/go-cmdtest")
- (synopsis "Testing for your CLI")
- (description
- "The cmdtest package simplifies testing of command-line interfaces. It
-provides a simple, cross-platform, shell-like language to express command
-execution. It can compare actual output with the expected output, and can
-also update a file with new \"golden\" output that is deemed correct.")
- (license license:asl2.0))))
-
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 16/19] gnu: go-honnef-co-go-tools: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2c59da6a5b7158ba1ca65e7fa74ceafdc33bc41e.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-honnef-co-go-tools): Move from
here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 36 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 ------------------------------
2 files changed, 36 insertions(+), 31 deletions(-)

Toggle diff (98 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index ce4afe64ac..011198231d 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 ( <paren@disroot.org>
@@ -45,6 +46,41 @@ (define-module (gnu packages golang-check)
;;;
;;; Code:
+(define-public go-honnef-co-go-tools
+ (package
+ (name "go-honnef-co-go-tools")
+ (version "0.3.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dominikh/go-tools")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "honnef.co/go/tools"
+ #:tests? #f
+ ;; Source-only package
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (propagated-inputs
+ (list go-github-com-burntsushi-toml
+ go-github-com-kisielk-gotool
+ go-golang-org-x-exp
+ go-golang-org-x-mod
+ go-golang-org-x-tools))
+ (home-page "https://honnef.co/go/tools")
+ (synopsis "Staticcheck advanced Go linter")
+ (description
+ "Staticcheck is a state of the art linter for the Go programming language.
+Using static analysis, it finds bugs and performance issues, offers
+simplifications, and enforces style rules.")
+ (license license:expat)))
+
(define-public go-github-com-cheekybits-is
(let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3ff544a67b..2503fca0b6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11529,37 +11529,6 @@ (define-public go-github-com-kisielk-gotool
tools with similar semantics.")
(license license:expat)))
-(define-public go-honnef-co-go-tools
- (package
- (name "go-honnef-co-go-tools")
- (version "0.3.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dominikh/go-tools")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "honnef.co/go/tools"
- #:tests? #f
- ;; Source-only package
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (propagated-inputs (list go-golang-org-x-exp go-golang-org-x-tools
- go-golang-org-x-mod go-github-com-kisielk-gotool
- go-github-com-burntsushi-toml))
- (home-page "https://honnef.co/go/tools")
- (synopsis "Staticcheck advanced Go linter")
- (description
- "Staticcheck is a state of the art linter for the Go programming language.
-Using static analysis, it finds bugs and performance issues, offers
-simplifications, and enforces style rules.")
- (license license:expat)))
-
(define-public go-go-uber-org-zap
(package
(name "go-go-uber-org-zap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 17/19] gnu: go-golang-org-x-lint: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ee5ef5a7678035e38c28209b1a44c31d36d7610e.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-golang-org-x-lint): Move from
here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 011198231d..56f412224e 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -458,6 +458,34 @@ (define-public go-gopkg-in-go-playground-assert-v1
custom assertions to be used alongside native Go testing.")
(license license:expat)))
+(define-public go-golang-org-x-lint
+ (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
+ (revision "0"))
+ (package
+ (name "go-golang-org-x-lint")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://go.googlesource.com/lint")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "golang.org/x/lint"
+ #:tests? #f)) ;; TODO: Fix tests
+ (propagated-inputs
+ (list go-golang-org-x-tools))
+ (home-page "https://golang.org/x/lint")
+ (synopsis "Linter for Go source code")
+ (description
+ "This is a linter for Go source code. Unlike gofmt, it doesn't
+reformat the source code, it only prints out style mistakes.")
+ (license license:bsd-3))))
+
;;;
;;; 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 2503fca0b6..e5dd116766 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11477,34 +11477,6 @@ (define-public go-mvdan-cc-xurls
(native-inputs '())
(inputs '())))
-(define-public go-golang-org-x-lint
- (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
- (revision "0"))
- (package
- (name "go-golang-org-x-lint")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/lint")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "golang.org/x/lint"
- #:tests? #f)) ;; TODO: Fix tests
- (propagated-inputs
- (list go-golang-org-x-tools))
- (home-page "https://golang.org/x/lint")
- (synopsis "Linter for Go source code")
- (description
- "This is a linter for Go source code. Unlike gofmt, it doesn't
-reformat the source code, it only prints out style mistakes.")
- (license license:bsd-3))))
-
(define-public go-github-com-kisielk-gotool
(package
(name "go-github-com-kisielk-gotool")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 15/19] gnu: go-github-com-onsi-ginkgo: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d029f7751a29da3ba8eec2c05b3087753d5fde5c.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-onsi-ginkgo):
Move from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 32 ++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 32 insertions(+), 28 deletions(-)

Toggle diff (91 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index eb4f085bbf..ce4afe64ac 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
@@ -274,6 +275,37 @@ (define-public go-github-com-jacobsa-ogletest
messages automatically.")
(license license:asl2.0))))
+(define-public go-github-com-onsi-ginkgo
+ (package
+ (name "go-github-com-onsi-ginkgo")
+ (version "1.16.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/onsi/ginkgo")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/onsi/ginkgo"))
+ (propagated-inputs
+ (list go-golang-org-x-sys
+ go-golang-org-x-tools
+ go-github-com-go-task-slim-sprig
+ go-github-com-nxadm-tail
+ go-github-com-onsi-gomega))
+ (home-page "https://github.com/onsi/ginkgo")
+ (synopsis "BDD-style testing framework for Go")
+ (description
+ "Ginkgo is a Behaviour-Driven Development testing framework for Go. It
+builds on top of Go's builtin @code{testing} library and is complemented by the
+Gomega matcher library.")
+ (license license:expat)))
+
(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 5abe17bf3e..3ff544a67b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -13615,34 +13615,6 @@ (define-public go-github-com-onsi-gomega
"Gomega is the preferred matcher library for the Ginkgo test framework.")
(license license:expat)))
-(define-public go-github-com-onsi-ginkgo
- (package
- (name "go-github-com-onsi-ginkgo")
- (version "1.16.5")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/onsi/ginkgo")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz"))))
- (build-system go-build-system)
- (arguments (list #:import-path "github.com/onsi/ginkgo"))
- (propagated-inputs (list go-golang-org-x-sys
- go-golang-org-x-tools
- go-github-com-go-task-slim-sprig
- go-github-com-nxadm-tail
- go-github-com-onsi-gomega))
- (home-page "https://github.com/onsi/ginkgo")
- (synopsis "BDD-style testing framework for Go")
- (description
- "Ginkgo is a Behaviour-Driven Development testing framework for Go. It
-builds on top of Go's builtin @code{testing} library and is complemented by the
-Gomega matcher library.")
- (license license:expat)))
-
;;;
;;; 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
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 18/19] gnu: go-golang-org-sql-mock: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
8ae71268e6de91f7c157e413c0ca90fa64ee009a.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-golang-org-sql-mock): Move from
here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
2 files changed, 27 insertions(+), 25 deletions(-)

Toggle diff (83 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 56f412224e..8fc9d2fbc0 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
@@ -458,6 +459,32 @@ (define-public go-gopkg-in-go-playground-assert-v1
custom assertions to be used alongside native Go testing.")
(license license:expat)))
+(define-public go-golang-org-sql-mock
+ (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b")
+ (version "1.3.3")
+ (revision "1"))
+ (package
+ (name "go-golang-org-sql-mock")
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/DATA-DOG/go-sqlmock")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/DATA-DOG/go-sqlmock"))
+ (synopsis "Mock library implementing @code{sql/driver}")
+ (description "This library simulates SQL-driver behavior in tests
+without requiring a real database connection.")
+ (home-page "https://github.com/DATA-DOG/go-sqlmock")
+ (license license:expat))))
+
(define-public go-golang-org-x-lint
(let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e5dd116766..aedf509c97 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7228,31 +7228,6 @@ (define-public go-github-com-kr-text
(home-page "https://github.com/kr/text")
(license license:expat)))
-(define-public go-golang-org-sql-mock
- (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b")
- (version "1.3.3")
- (revision "1"))
- (package
- (name "go-golang-org-sql-mock")
- (version (git-version version revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/DATA-DOG/go-sqlmock")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/DATA-DOG/go-sqlmock"))
- (synopsis "Mock library implementing @code{sql/driver}")
- (description "This library simulates SQL-driver behavior in tests
-without requiring a real database connection.")
- (home-page "https://github.com/DATA-DOG/go-sqlmock")
- (license license:expat))))
-
(define-public go-github-com-go-sql-driver-mysql
(package
(name "go-github-com-go-sql-driver-mysql")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 03:29
[PATCH 19/19] gnu: go-github-com-alecthomas-assert: Move to (gnu packages golang-check).
(address . 66619@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c54dfea25897b3b182c152cfdf3edbf479e84e40.1697678664.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-alecthomas-assert): Move
from here...
* gnu/packages/golang.scm: ... to here.
---
gnu/packages/golang-check.scm | 35 +++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
2 files changed, 35 insertions(+), 31 deletions(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 8fc9d2fbc0..42e501a6e3 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -82,6 +83,40 @@ (define-public go-honnef-co-go-tools
simplifications, and enforces style rules.")
(license license:expat)))
+(define-public go-github-com-alecthomas-assert
+ (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06")
+ (revision "1"))
+ (package
+ (name "go-github-com-alecthomas-assert")
+ (version (git-version "0.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alecthomas/assert")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/alecthomas/assert"))
+ (native-inputs
+ (list go-github-com-alecthomas-colour
+ go-github-com-mattn-go-isatty
+ go-github-com-alecthomas-repr
+ go-github-com-sergi-go-diff))
+ (home-page "https://github.com/alecthomas/assert/")
+ (synopsis "Go assertion library")
+ (description "Assertion library that:
+@itemize
+@item makes spotting differences in equality much easier
+@item uses repr and diffmatchpatch to display structural differences in colour
+@item aborts tests on first assertion failure
+@end itemize\n")
+ (license license:expat))))
+
(define-public go-github-com-cheekybits-is
(let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index aedf509c97..b32e379e47 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9219,37 +9219,6 @@ (define-public go-github-com-sergi-go-diff
@end itemize\n")
(license license:expat)))
-(define-public go-github-com-alecthomas-assert
- (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06")
- (revision "1"))
- (package
- (name "go-github-com-alecthomas-assert")
- (version (git-version "0.0.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/alecthomas/assert")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/alecthomas/assert"))
- (native-inputs
- (list go-github-com-mattn-go-isatty go-github-com-alecthomas-colour
- go-github-com-alecthomas-repr go-github-com-sergi-go-diff))
- (home-page "https://github.com/alecthomas/assert/")
- (synopsis "Go assertion library")
- (description "Assertion library that:
-@itemize
-@item makes spotting differences in equality much easier
-@item uses repr and diffmatchpatch to display structural differences in colour
-@item aborts tests on first assertion failure
-@end itemize\n")
- (license license:expat))))
-
(define-public go-github-com-alecthomas-chroma
(package
(name "go-github-com-alecthomas-chroma")
--
2.41.0
M
M
Maxim Cournoyer wrote on 19 Oct 2023 03:56
Re: [bug#66619] [PATCH 1/1] etc: Add guix-health.sh
(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)(address . 66619@debbugs.gnu.org)
8734y7qss5.fsf@gmail.com
Hi!

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

Toggle quote (2 lines)
> * etc/guix-health.sh: New file.

It looks like this one submitted to this series ([PATCH 00/19] Split
(gnu packages golang) part I) by mistake (maybe using 'mumi send-email'
without doing 'mumi new') ?

If so, please send it anew as its own issue for better visibility.

--
Thanks,
Maxim
S
S
Sharlatan Hellseher wrote on 19 Oct 2023 11:36
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 66619@debbugs.gnu.org)
CAO+9K5pBAqiyMp75Mc3jHbDWPD=E-A13j8ukz8HZRwYeDyJLvA@mail.gmail.com
Hi,
Oops,
#66619 includes #66297, I've not cleaned up after it's been sent.
Cleaned up patch series including only golang split process.
Thanks,
Oleg
On Thu, 19 Oct 2023 at 02:56, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
Toggle quote (16 lines)
>
> Hi!
>
> Sharlatan Hellseher <sharlatanus@gmail.com> writes:
>
> > * etc/guix-health.sh: New file.
>
> It looks like this one submitted to this series ([PATCH 00/19] Split
> (gnu packages golang) part I) by mistake (maybe using 'mumi send-email'
> without doing 'mumi new') ?
>
> If so, please send it anew as its own issue for better visibility.
>
> --
> Thanks,
> Maxim
--
… ??? ????? - ???????????? ?????????????? ?????? ??????? ????????
????? ????? ????? ? ??? ??????, ??????????? ????? ???????, ??
?????????? ?? ? ????????? ??????? ????? ? ?????????????????.
M
M
Maxim Cournoyer wrote on 23 Oct 2023 04:25
Re: [bug#66619] [PATCH 00/19] Split (gnu packages golang) part I
(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
87y1fu848f.fsf@gmail.com
Hello,

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

Toggle quote (10 lines)
> Hi Guix!
>
> Here is a first portion to split monolithic (gnu packages golang) into logical
> modules, following similar logic as python-*, perl-*, lisp-*.
>
> Copiright headers are migrated based on the history of gnu/packages/golang.scm
> file and includes all contributors introduced packages or modified it.
>
> I've perform some checks applied to ensure the quality of the migration.

LGTM! I've installed the series.

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 66619@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 66619
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch