[PATCH 00/30] Split (gnu packages golang) part IV.

Done

Details

2 participants

Liliana Marie Prikler
Sharlatan Hellseher

Owner: unassigned

Submitted by: Sharlatan Hellseher

Severity: normal

Sharlatan Hellseher wrote on 11 Feb 11:36 +0100

Recipients:(address . guix-patches@gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:cover.1707646257.git.sharlatanus@gmail.com

Hi Guix!

This is part IV of the patch series that splits the monolithic (gnu packages

golang) into logical blocks.

The series includes 2 new modules: (gnu packages golang-build) - for any

golang extension and build packages, which are intended to have 0 dependencies

on other golang-* modules; (gnu packages golang-compression) - for any golang

packages related to archiving and compression.

I also initiated the movement of packages from (gnu package syncthing) into

golang-* modules to ease their maintenance and searchability. A quick analysis

of the packages placed there shows me that it was done long ago, just before

golang.scm started aggregating packages.

As in the previous split, all packages were migrated with copyright headers,

and measures were taken to ensure that the move does not introduce any build

regressions.

Modules which include packages from (gnu packages golang-build):

Toggle snippet (40 lines)grep -El $(grep define-public gnu/packages/golang-build.scm |cut -d" " -f2 | paste -s -d"\\|" -) gnu/packages/*.scm | sort
gnu/packages/admin.scm
gnu/packages/backup.scm
gnu/packages/bioinformatics.scm
gnu/packages/check.scm
gnu/packages/configuration-management.scm
gnu/packages/crypto.scm
gnu/packages/curl.scm
gnu/packages/databases.scm
gnu/packages/disk.scm
gnu/packages/docker.scm
gnu/packages/education.scm
gnu/packages/file-systems.scm
gnu/packages/games.scm
gnu/packages/golang-build.scm
gnu/packages/golang-check.scm
gnu/packages/golang-crypto.scm
gnu/packages/golang.scm
gnu/packages/golang-web.scm
gnu/packages/golang-xyz.scm
gnu/packages/high-availability.scm
gnu/packages/image-viewers.scm
gnu/packages/ipfs.scm
gnu/packages/irc.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/messaging.scm
gnu/packages/networking.scm
gnu/packages/password-utils.scm
gnu/packages/shellutils.scm
gnu/packages/syncthing.scm
gnu/packages/terminals.scm
gnu/packages/textutils.scm
gnu/packages/uucp.scm
gnu/packages/version-control.scm
gnu/packages/vpn.scm
gnu/packages/weather.scm
gnu/packages/web.scm

Modules which use (gnu packages golang-build):

Toggle snippet (39 lines)grep -r -l "golang-build" . | grep ".*\.scm" | sort
./gnu/packages/admin.scm
./gnu/packages/backup.scm
./gnu/packages/bioinformatics.scm
./gnu/packages/check.scm
./gnu/packages/configuration-management.scm
./gnu/packages/crypto.scm
./gnu/packages/curl.scm
./gnu/packages/databases.scm
./gnu/packages/disk.scm
./gnu/packages/docker.scm
./gnu/packages/education.scm
./gnu/packages/file-systems.scm
./gnu/packages/golang-build.scm
./gnu/packages/golang-check.scm
./gnu/packages/golang-crypto.scm
./gnu/packages/golang.scm
./gnu/packages/golang-web.scm
./gnu/packages/golang-xyz.scm
./gnu/packages/high-availability.scm
./gnu/packages/image-viewers.scm
./gnu/packages/ipfs.scm
./gnu/packages/irc.scm
./gnu/packages/linux.scm
./gnu/packages/mail.scm
./gnu/packages/messaging.scm
./gnu/packages/networking.scm
./gnu/packages/password-utils.scm
./gnu/packages/shellutils.scm
./gnu/packages/syncthing.scm
./gnu/packages/terminals.scm
./gnu/packages/textutils.scm
./gnu/packages/uucp.scm
./gnu/packages/version-control.scm
./gnu/packages/vpn.scm
./gnu/packages/weather.scm
./gnu/packages/web.scm

Make sure all packages from (gnu packages golang-build) are still buildable:

Toggle snippet (19 lines)./pre-inst-env guix build $(grep define-public gnu/packages/golang-build.scm |cut -d" " -f2)
/gnu/store/srrgygkmiqwgprqbma8y1inwycshq68a-go-golang-org-x-xerrors-0.0.0-0.5ec99f8
/gnu/store/2i541kg5gvip13pn5mdh357ymbh6lmm9-go-golang-org-x-tools-0.5.0
/gnu/store/w75as6d7h9nzxbqrdvv696mqzppsj1kv-go-golang-org-x-time-0.0.0-2.9d24e82
/gnu/store/8k4dk2b0wcf8kliwbl3bc1l19mr49al1-go-golang-org-x-text-0.3.2
/gnu/store/fqpflhyxr2h0j0r8qqjx4qw304cbnkiv-go-golang-org-x-term-0.3.0
/gnu/store/7f6ddsxfd0zmqmklrvivhjx4awj7rh3j-go-golang-org-x-sys-0.8.0-0.ca59eda
/gnu/store/1b99afbhip3vry9k4xzb41l1m1z7jl3v-go-golang-org-x-sync-semaphore-0.0.0-0.cd5d95a
/gnu/store/dfmrx64yhrzgfkym3wi2g5njpmb15w8b-go-golang-org-x-sync-errgroup-0.0.0-0.cd5d95a
/gnu/store/hm5ngd8lgcd5azx5k1fiqmjhsvcnjk34-go-golang-org-x-sync-0.1.0-1.8fcdb60
/gnu/store/f8b8lia6maij9pkrjslmsfvylz81dqdp-go-golang-org-x-net-html-0.5.0-0.8e0e7d8
/gnu/store/2x0wwpb4j99zhjvpgnb9j5sii9ld3783-go-golang-org-x-net-0.17.0-0.b225e7c
/gnu/store/ngzwi32sn8f9k4rs9gkzb7v7b8ksmc5v-go-golang-org-x-mod-0.7.0-0.7c05a44
/gnu/store/ybwxwij2i8j7lvw6y384v1pc801r0cw3-go-golang-org-x-image-0.0.0-1.58c2397
/gnu/store/52c7lclfbg9ailgfd6c39jqvmmag1zng-go-golang-org-x-exp-0.0.0-20221004215720-b9f4876ce741
/gnu/store/c6wkaawj789l3xw249mwwd1ia6gpldzh-go-golang-org-x-crypto-0.4.0
/gnu/store/7x721afdkmga45wwqnskvc77l253azzq-go-github-com-yuin-goldmark-1.2.1

Modules which include packages from (gnu packages golang-compression):

Toggle snippet (14 lines)grep -El $(grep define-public gnu/packages/golang-compression.scm |cut -d" " -f2 | paste -s -d"\\|" -) gnu/packages/*.scm | sort
gnu/packages/admin.scm
gnu/packages/bioinformatics.scm
gnu/packages/golang-compression.scm
gnu/packages/golang-crypto.scm
gnu/packages/golang.scm
gnu/packages/golang-web.scm
gnu/packages/golang-xyz.scm
gnu/packages/high-availability.scm
gnu/packages/ipfs.scm
gnu/packages/syncthing.scm
gnu/packages/uucp.scm

Modules which use (gnu packages golang-compression):

Toggle snippet (14 lines)grep -r -l "golang-compression" . | grep ".*\.scm" | sort
./gnu/packages/admin.scm
./gnu/packages/bioinformatics.scm
./gnu/packages/golang-compression.scm
./gnu/packages/golang-crypto.scm
./gnu/packages/golang.scm
./gnu/packages/golang-web.scm
./gnu/packages/golang-xyz.scm
./gnu/packages/high-availability.scm
./gnu/packages/ipfs.scm
./gnu/packages/syncthing.scm
./gnu/packages/uucp.scm

Make sure all packages from (gnu packages golang-compression) are still buildable:

Toggle snippet (7 lines)

./pre-inst-env guix build $(grep define-public gnu/packages/golang-compression.scm |cut -d" " -f2)

/gnu/store/y5rsj4qpllbyqddpz0ym2n4qns6cvfkn-go-github.com-ulikunitz-xz-0.5.8

/gnu/store/lydycbf7qdjl0dw8h2fxm97acwqip9bm-go-github-com-klauspost-compress-1.13.1

/gnu/store/9zbaiz6p0wqbwwzzb8fhma6ahjkbl6cb-go-github-com-golang-snappy-0.0.4

/gnu/store/l594n6gixr81kwrpbdi2plwaysjql1al-go-github-com-andybalholm-brotli-1.0.4

I've run build locally and even the list shows 1301 packages non of the were
rebuilt.  There are packages which were failed to build for long time before
this split:

- chezmoi@1.8.1
- fiano-fmap@5.0.0
- nncp@7.5.0
- r-bioconcotk@1.22.0
- rcas-web@0.1.0
- r-mlr3ordinal@0.1.0-9000-1.736e3a3
- js-context-menu@0.6.1

List all dependent packages and make sure all of them are buildable:

Toggle snippet (183 lines)./pre-inst-env guix refresh --list-dependent $(grep define-public gnu/packages/golang-build.scm gnu/packages/golang-build.scm |cut -d" " -f2)

Building the following 628 packages would ensure 1301 dependent packages are
rebuilt: go-github-com-aws-sdk@1.35.2
go-github-com-gabriel-vasile-mimetype@1.4.3 go-github-com-jcmturner-rpc@2.0.3
sendgmail@0.0.0-1.e322915 xurls@2.4.0 go-go-etcd-io-bbolt@1.3.6 tmsu@0.7.5
restic-rest-server@0.11.0 go-minisign@0.1.0
go-github-com-marten-seemann-qtls@0.4.1 go-github-com-coreos-go-oidc@2.2.1
go-github-com-dreamacro-go-shadowsocks2@0.1.7 gx@0.14.3 gx-go@1.9.0
go-github-com-go-ldap-ldap@3.4.1 go-minify@2.12.7 actionlint@1.6.26 gron@0.7.1
go-github-com-google-go-jsonnet@0.18.0 demlo@3.8-0.fe9ec4c emacs-envrc@0.6
emacs-direnv@2.2.0 gojq@0.12.11 go-github-com-itchyny-gojq@0.12.11
go-github-com-docker-distribution@0.0.0-0.325b080
go-github-com-dhowett-go-plist@0.0.0-1.1454fab browserpass-native@3.1.0
go-github-com-syncthing-notify@0.0.0-5.69c7a95
go-github-com-oschwald-geoip2-golang@1.4.0 wego@2.1 r-rgexf@0.16.2
r-opencpu@2.2.11 js-respond@1.4.2 js-context-menu@0.6.1 js-xmldom-sre@0.1.32
js-json2@2016-10-28.1-031b1d9 snap@7.0.5 js-es5-shim@4.5.13 js-commander@6.2.1
js-html5shiv@3.7.3 r-sangerseqr@1.38.0 r-shinyhelper@0.3.2 r-tablerdash@0.1.0
r-abtest@1.0.1 r-fresh@0.2.0 r-shinycustomloader@0.9.0 r-golem@0.4.1
r-shinymeta@0.2.0.3 r-zscorer@0.3.1 r-citr@0.3.2
ungoogled-chromium-wayland@112.0.5615.165-1 emacs-nodejs-repl@0.2.4
geierlein@0.9.13 icecat-l10n@115.7.0-guix0-preview1 icedove-l10n@102.15.0
icecat-minimal@115.7.0-guix0-preview1 r-metap@1.9 r-prospectr@0.2.6
r-fmri@1.9.12 r-puniform@0.2.7 r-untb@1.7-7 js-mathjax@3.2.0
node-global-gradle-clean@1.0.1 node-mersenne@0.0.4
node-safe-stable-stringify@2.4.3 node-statsd-parser@0.0.4
node-stack-trace@0.0.10-1.4fd379e node-color-name@1.1.3 node-path-key@4.0.0
node-normalize-path@3.0.0 node-segfault-handler@1.3.0 node-sqlite3@5.0.2
node-irc@0.5.2 node-crx3@1.1.3 node-once@1.4.0 node-env-variable@0.0.4
node-serialport@9.2.7 python-ikarus@0.0.2 python-bulkvis@2.0.0-2.00a82a9
python-pyside-6@6.5.2 qutebrowser@3.1.0 tree-sitter-racket@0.1.0-0.1a5df02
tree-sitter-elm@5.6.3 tree-sitter-css@0.19.0 tree-sitter-lua@0.0.19
tree-sitter-go@0.20.0 tree-sitter-meson@1.2-0.3d6dfbd
tree-sitter-php@0.19.0-0.f860e59 tree-sitter-scala@0.20.2
tree-sitter-markdown-gfm@0.7.1 tree-sitter-heex@0.6.0 tree-sitter-rust@0.20.4
tree-sitter-cmake@0.4.1 tree-sitter-bibtex@0.1.0-0.ccfd77d
tree-sitter-c-sharp@0.20.0 emacs-jsdoc@0.3 python-tree-sitter@0.20.1
tree-sitter-clojure@0.0.11 tree-sitter-scheme@0.2.0-0.67b90a3
tree-sitter-elixir@0.19.0-0.b20eaa7 tree-sitter-ocaml@0.20.1
tree-sitter-plantuml@1.0.0-0.bea443e tree-sitter-bash@0.20.4
tree-sitter-java@0.20.1 tree-sitter-dockerfile@0.1.2 tree-sitter-json@0.20.0
tree-sitter-julia@0.19.0 tree-sitter-typescript@0.20.3 tree-sitter-html@0.19.0
tree-sitter-cpp@0.20.3 tree-sitter-gomod@1.0.0 tree-sitter-markdown@0.1.1
tree-sitter-r@0.0.1-0.80efda5 tree-sitter-org@1.3.1-0.081179c
tree-sitter-haskell@0.14.0-0.3bdba07 tree-sitter-ruby@0.19.0-0.206c707
laminar@1.3 mate@1.26.1 gr-satellites@4.6.0 urh@2.9.4 gr-dsd@1.0.0-0.f9b9936
gnss-sdr@0.0.17 gqrx@2.17.3 node-openzwave-shared@1.7.2 r-dot@0.1 r-dsb@1.0.3
r-rticles@0.26 r-aggregatebiovar@1.12.0 r-oai@0.4.0 r-rxnat@1.0.15
r-rtweet@1.2.1 r-oscope@1.32.0 r-bedr@1.0.7 r-vdiffr@1.0.7
r-mlr3ordinal@0.1.0-9000-1.736e3a3 r-abn@3.0.4 r-mbess@4.9.3 r-altmeta@4.1
r-caic4@1.0 r-effects@4.2-2 r-samr@3.0 r-sloop@1.0.1 r-activitycounts@0.1.2
r-fishpond@2.8.0 r-nbpseq@0.3.1 r-anota@1.50.0 r-r3cseq@1.48.0 r-bacon@1.30.0
r-decomplexdisease@1.18.0 r-anota2seq@1.24.0 tetoolkit@2.2.1b r-chromstar@1.28.0
r-ace@1.20.0 r-anaquin@2.26.0 r-dada2@1.30.0 r-scdd@1.26.0 r-bandits@1.18.1
r-trnadbimport@1.20.1 r-xina@1.20.0 r-m3c@1.24.0 r-savr@1.37.0 r-webbioc@1.74.0
r-adacgh2@2.42.0 r-activepathways@2.0.3 r-deconrnaseq@1.44.0
r-demuxmix@1.1.1-1.09a7918 roary@3.12.0 r-kbet@0.99.6-1.f35171d r-bdgraph@2.72
r-earlywarnings@1.1.29 r-zooarch@1.2 r-projpred@2.8.0 r-lemon@0.4.9
r-statcheck@1.4.0 r-abhgenotyper@1.0.1 r-ggpattern@1.0.1 r-gganimate@1.0.8
r-model4you@0.9-7 r-spectrum@1.1 r-ggtern@3.4.2 r-actcd@1.3-0 r-ggjoy@0.4.1
r-hrbrthemes@0.8.0 r-ggghost@0.2.1 r-complexupset@1.3.3 r-rvenn@1.1.0
r-acc@1.3.3 r-acsnminer@0.16.8.25 r-inext@3.0.0 r-densityclust@0.3.3
r-zoon@0.6.5 r-ggthemeassist@0.1.5 r-ggfittext@0.10.2 r-treemap@2.4-4
r-dlmap@1.13 r-enrichr@3.2 r-ggstance@0.3.6 r-abacus@1.0.0 r-precrec@0.14.4
r-mlrmbo@1.1.5.1 r-plotroc@2.3.1 r-iml@0.11.1 r-actigraphy@1.4.0 r-dalex@2.4.3
r-banocc@1.26.0 r-gghalves@0.1.4 r-zonator@0.6.0 r-ggbreak@0.1.2
r-reghelper@1.1.2 r-linnorm@2.26.0 r-breakpointr@1.20.0 r-pcatools@2.14.0
r-aneufinder@1.30.0 r-tradeseq@1.16.0 r-globalancova@4.20.0
r-mixedpower@2.0-2.b2b8706 r-psupertime@0.2.6-1.73825a2 r-accsda@1.1.2
r-chromvarmotifs@0.2.0-1.38bed55 r-shinycell@2.0.0-1.aecbd56 r-eyelinker@0.2.1
r-abcrf@1.9 r-abbyyr@0.5.5 r-readtext@0.90 r-rio@1.0.1 r-wiggleplotr@1.26.0
r-megadepth@1.12.0 r-tricycle@1.10.0 r-xbseq@1.22.0 r-biocdockermanager@1.11.0
r-dearseq@1.14.0 r-plyranges@1.22.0 r-scmap@1.24.0 r-airpart@1.10.0
r-gg3d@0.0.0.9000-1.ffdd837 r-bseqsc@1.0-1.fef3f3e r-miamiplot@1.1.0-1.beede9c
r-icellnet@1.0-0.b9c0548 r-conqur@2.0-1.c7a8879 r-moonbook@0.3.1 r-zvcv@2.1.2
r-sungeo@1.1.1 r-tidygeocoder@1.0.5 r-zoltr@0.5.1 r-homologene@1.4.68.19.3.27
r-tidytext@0.4.1 r-assertr@3.0.1 r-conos@1.5.1 r-pagoda2@1.0.11 r-netgsa@4.0.5
r-parcor@0.2-6 r-tarchetypes@0.7.12 r-acdm@1.0.4.2 r-adaptalint@0.2.4
r-ggdist@3.3.1 r-accept@1.0.0 r-debcam@1.20.0 r-biotmle@1.26.0 r-useful@1.2.6.1
r-multidplyr@0.1.3 r-ggpmisc@0.5.5 r-gghighlight@0.4.1 r-ztype@0.1.0
r-babelwhale@1.2.0 r-ctrdata@1.17.1 r-hierfstat@0.5-11 r-ggvenndiagram@1.5.0
r-oenb@0.0.2 r-ggvenn@0.1.10 r-quantpsyc@1.6 r-depecher@1.18.0 r-affixcan@1.20.0
r-alpsnmr@4.4.0 r-zfpkm@1.24.0 r-wppi@1.10.0 r-barcodetrackr@1.10.0
r-biocset@1.16.0 r-metaneighbor@1.22.0 r-bgeedb@2.28.0 python-baltica@1.1.2
r-bedtorch@0.1.12.12-1.f5ff4f8 r-psiplot@2.3.0 r-bpcells@0.1.0-1.32ce673
r-ggsankey@0.0.99999-1.be08dd0 r-liana@0.1.11-1.10d8177
r-cellchat@1.0.0-1.21edd22 r-summarytools@1.0.1 r-abjutils@0.3.2
r-caretensemble@2.0.3 r-nestedcv@0.7.4 r-actfrag@0.1.1 r-europepmc@0.4.3
r-milor@1.10.0 r-ciara@0.1.0 r-screpertoire@1.12.0 r-clustree@0.5.1
r-sitar@1.4.0 r-climaemet@1.2.1 r-progeny@1.24.0 r-degreport@1.38.5
r-biobroom@1.34.0 r-valr@0.7.0 r-gwastools@1.48.0 r-accelmissing@1.4
r-toast@1.16.0 r-baalchip@1.28.0 r-rbamtools@2.16.17 r-aer@1.2-12 r-r2glmm@0.1.2
r-millefy@0.1.9-beta r-analytics@3.0 r-fsa@0.9.5 r-ez@4.4-0 r-simr@1.0.7
r-zoomgroupstats@0.1.0 r-textclean@0.9.3 r-actogrammr@0.2.3
r-plsdabatch@0.2.3-1.4aadf3a r-dae@3.2.21 r-rtcga@1.32.0 r-mc2d@0.2.0
r-ggtreeextra@1.12.0 r-numbat@1.3.2-1 r-reactomepa@1.46.0
r-clusterprofiler@4.10.0 r-numbat@1.3.2-1-1.4ab7752 r-ggfortify@0.4.16
r-tidypredict@0.5 r-ggstatsplot@0.12.2 r-pupillometryr@0.0.5 r-sjplot@2.8.15
r-harmony@0.1 r-partr2@0.9.1 r-abd@0.2-8 r-flexsurv@2.2.2 r-dyngen@1.0.5
r-ggmap@4.0.0 r-tidymodels@1.1.1 r-metacell@0.3.41-1.d6a6926 r-naniar@1.0.0
r-googlesheets@0.3.0 r-sushi@1.34.0 r-transcriptr@1.30.0 r-chipseeker@1.38.0
r-rtcgatoolbox@2.32.1 r-ensdb-mmusculus-v79@2.99.0 r-ensdb-hsapiens-v75@2.99.0
r-ensdb-hsapiens-v79@2.99.0 r-guitar@2.18.0 r-alpine@1.26.0 r-rhisat2@1.18.0
r-inspect@1.32.1 r-txdb-dmelanogaster-ucsc-dm6-ensgene@3.12.0
r-structuralvariantannotation@1.18.0 r-deepsnv@1.48.0 r-bbcanalyzer@1.32.0
r-quasr@1.42.1 r-fcscan@1.16.0 r-damefinder@1.14.0 r-mutationalpatterns@3.12.0
r-varianttools@1.44.0 r-cardelino@1.4.0 r-chromunity@0.0.2-1.712e56c
r-txdb-celegans-ucsc-ce6-ensgene@3.2.2 r-decomptumor2sig@2.18.0 r-pasilla@1.30.0
r-xcir@1.8.0-1.3b59d45 r-tcgabiolinks@2.30.0 r-badregionfinder@1.30.0
r-biomartr@1.0.7 r-organism-dplyr@1.30.1 r-biodb@1.10.0 tombo@1.5.1 nanosv@1.2.4
flair@1.6.4 r-muscat@1.16.0 r-mmuphin@1.16.0 r-longdat@1.1.2 r-prereg@0.6.0
r-ztable@0.2.3 r-atsnp@1.18.0 r-diffbind@3.12.0 r-streamgraph@0.9.0-1.76f7173
r-rbokeh@0.5.2 r-manipulatewidget@0.11.1 r-mlinterfaces@1.82.0 r-chromomap@4.1.1
r-zra@0.2 r-excelr@0.4.0 r-abstractr@0.1.0 r-basics@2.14.0
r-shapforxgboost@0.1.3 r-sankeyd3@0.3.2-1.fd50a74 r-adabag@5.0 r-depth@2.1-1.1
r-abcdefba@0.4 r-voltron@1.0.0-1.5057b70 r-rnaseqdtu@2.0-1.5bee1e7
r-demultiplex2@1.0.0-1.e42bc83 r-battenberg@2.2.9 r-chemometricswithr@0.1.13
r-activpal@0.1.3 r-iheatmapr@0.7.1 r-leaflet@2.2.1 r-bioassayr@1.40.0
r-fmcsr@1.44.0 r-anvil@1.14.1 r-adamgui@1.18.0 r-icobra@1.30.0
r-biocpkgtools@1.20.0 r-radiogx@2.6.0 r-rgreat@2.4.0 r-hpo-db@0.99.2
r-isoformswitchanalyzer@2.2.0 r-atena@1.8.0 r-circrnaprofiler@1.16.0
r-sesame@1.20.0 r-scrnaseq@2.16.0 r-celldex@1.12.0 r-bodymaprat@1.18.0
r-msigdb@1.10.0 r-mousegastrulationdata@1.16.0 r-hpar@1.44.0
r-methylclockdata@1.10.0 r-mpo-db@0.99.7 r-circus@0.1.7
r-interactivedisplay@1.40.0 r-alevinqc@1.18.0 r-zooimage@5.5.2 r-brms@2.20.4
r-tidyposterior@1.0.1 r-shinymanager@1.0.410 r-amplican@1.24.0
r-alphabeta@1.16.0 r-biosigner@1.30.0 r-multibac@1.12.0 r-asics@2.18.0
r-protgear@1.6.0 r-gqtlstats@1.21.3 r-singscore@1.22.0 r-animalcules@1.18.2
r-giotto@1.1.2-1.3c8067c r-skitools@0.0.0.9000-1.22d107d r-pcaexplorer@2.28.0
r-ggalt@0.4.0 r-seurat5@4.9.9.9044-1.9d59c02 r-radiant-data@1.6.3 rcas-web@0.1.0
r-nebulosa@1.12.0 r-cellid@1.10.1 r-infercnv@1.18.1
r-sccustomize@2.0.1-1.3973745 r-domultibarheatmap@0.1.0-1.9e65afa
r-doubletcollection@1.1.0-1.c0d62f1 r-projectils@3.0.0-1.cc73b97
r-seuratwrappers@0.3.1-1.d28512f r-singlet@0.99.26-1.765a6c4 r-ctrialsgov@0.2.5
r-cistopic-next@0.3.0-1.04cecbb r-cistopic@2.1.0 r-scenic@1.3.1-1.cedf849
r-copykat@1.0.8-0.256de33 r-scseqcomm@0-0.01076e7 r-formattable@0.2.1
r-biocworkflowtools@1.28.0 r-xcms@4.0.2 r-msnid@1.36.0 r-yamss@1.28.0
r-adductomicsr@1.18.0 r-flowmeans@1.62.0 r-flowstats@4.14.1 r-hdcytodata@1.22.0
r-cycombine@0.2.6-1.f18504b r-catalyst@1.26.0 r-diffcyt@1.22.0
r-premessa@0.3.4-1.68b42bb r-cytoexplorer@1.1.0-1.0efb1cc
r-cytobackbone@1.0.0-1.4c1a0a3 r-cytonorm@0.0.10-1.166f9ff r-ioniser@2.26.0
r-bayesspace@1.12.0 r-scone@1.26.0 r-bgeecall@1.18.1 r-arraymvout@1.60.0
r-rnbeads@2.20.0 r-flowsorted-blood-epic@2.6.0 r-methylaid@1.36.0
r-flowsorted-blood-450k@1.40.0 pigx-sars-cov-2@0.0.9 r-yarn@1.28.0
r-shinymethyl@1.38.0 r-enmix@1.38.01 r-bigmelon@1.28.0
r-illuminahumanmethylationepicanno-ilm10b5-hg38@0.0.1-1.3db0691
r-dnamcrosshyb@0.0.0.9000-1.fe8acb3 r-maxprobes@0.0.2-1.c2120db
r-clusterexperiment@2.22.0 r-atacseqqc@1.26.0 r-phastcons100way-ucsc-hg19@3.7.2
r-mafh5-gnomad-v3-1-2-grch38@3.15.0 r-dss@2.50.1 r-escape@1.12.0
r-azimuth@0.5.0-1.243ee5d r-biscuiteer@1.16.0 r-amaretto@1.18.0
r-bioconcotk@1.22.0 r-ggpicrust2@1.7.3 r-mbecs@1.6.0 r-microbiome@1.24.0
r-btools@0.0.1-1.fa21d4c r-sleuth@0.30.1 r-archr@1.0.1-1.92ab814 r-snapatac@2.0
r-wasabi@1.0.1-1.8c33cab r-pore@0.24 r-spectre@0.5.5-1.f6648ab r-abseqr@1.20.0
r-deco@1.13.0 r-papaja@0.1.2 r-pando@1.0.5 trinityrnaseq@2.13.2
r-disgenet2r@0.99.2-1.8d8ce37 r-seurat-utils@2.5.0-1.c0374cc r-adapr@2.0.0
r-acmeeqtl@1.6 r-scannotatr@1.8.0 r-collapsibletree@0.1.8 r-webchem@1.3.0
r-learnr@0.11.5 r-ztpln@0.1.2 r-swne@0.6.20-1.05fc3ee
r-timeseriesexperiment@1.13.0 r-chicago@1.30.0 r-cummerbund@2.44.0
r-aspli@2.12.0 r-motifbreakr@2.16.0 r-cicero-monocle3@1.3.2-1.fa2fb65
r-allelicimbalance@1.40.0 r-maser@1.20.0 r-cicero@1.20.0 r-biomvrcns@1.42.2
r-trackviewer@1.38.1 r-genomicinteractions@1.36.0 r-variantfiltering@1.38.0
r-shaman@2.0-2.d6944e8 r-flames@1.8.0 r-fourcseq@1.24.0 r-yapsa@1.28.0
r-agimicrorna@2.52.0 r-riboprofiling@1.32.0 pigx@0.0.3 r-chipexoqual@1.26.0
r-karyoploter@1.28.0 r-rqc@1.36.0 r-bionetstat@1.22.0 r-champ@2.32.0
r-arrayqualitymetrics@3.58.0 r-ancombc@2.4.0 r-wavcluster@2.36.0
r-bigpint@1.15.0 r-genomicstate@0.99.15 r-bionero@1.10.0 r-seqgl@1.1.4
r-haplo-stats@1.9.5.1 r-rliger@0.4.2 r-acid@1.1 r-weights@1.0.4
r-adamethods@1.2.1 r-xkcd@0.0.6 r-semplot@1.1.6 r-abctools@1.1.7 r-aasea@1.1.0
r-knitrbootstrap@1.0.3 r-fivethirtyeight@0.1.0 curlie@1.7.2 gocryptfs@2.4.0
ssh-to-age@1.1.2 pass-age@1.7.4a1 fdroidcl@0.7.0 tz@0.6.1 aws-vault@6.6.2
pixterm@1.3.1 chathistorysync@0.2.0 hut@0.4.0 edirect@13.3.20200128
bitmask@0.21.11 go-github-com-hashicorp-hcl-v2@2.11.1
go-github-com-xdg-go-scram@1.0.2 lf@27 exercism@3.1.0 vale@2.4.0 csvdiff@1.4.0
emacs-fzf@0.2-0.21912eb ytfzf@2.6.0 ani-cli@4.6
go-github-com-junegunn-fzf@0.41.0 harmonist@0.4.1
kineto@0.0.0-20211105093215-857f8c97ebc5 miniflux@2.0.46
go-gitlab.com-shackra-goimapnotify@2.3.7 chezmoi@1.8.1 senpai@0.2.0
poussetaches@0.0.2 go-structlayout-optimize@0.4.6 go-staticcheck@0.4.6
go-structlayout-pretty@0.4.6 go-keyify@0.4.6 go-structlayout@0.4.6
kappanhang@1.3 lfs-s3@0.1.5 gofumpt@0.4.0
unparam@0.0.0-20221223090309-7455f1af531d gopls@

This message was truncated. Download the full message here.

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 04/30] gnu: go-github-com-golang-snappy: Mmove to (gnu packages golang-compression).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:a9b9cb34786694ebd302e8a5b1173aac55577bfb.1707646257.git.sharlatanus@gmail.com

* gnu/packages/syncthing.scm (go-github-com-golang-snappy): Move from
here ...
* gnu/packages/golang-compression.scm: ... to here.

* gnu/packages/golang.scm: Add (gnu packages golang-compression) module.
* gnu/packages/high-availability.scm: As above.
* gnu/packages/ipfs.scm: As above.
* gnu/packages/syncthing.scm: As above.

Change-Id: I936c82c127e1aa25dde20693bee70e5a871249fe
---
 gnu/packages/golang-compression.scm | 26 ++++++++++++++++++++++++++
 gnu/packages/golang.scm             |  1 +
 gnu/packages/high-availability.scm  |  4 ++--
 gnu/packages/ipfs.scm               |  1 +
 gnu/packages/syncthing.scm          | 24 +-----------------------
 5 files changed, 31 insertions(+), 25 deletions(-)

Toggle diff (139 lines)diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 268cd16e30..670572ea90 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,4 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,6 +33,29 @@ (define-module (gnu packages golang-compression)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-golang-snappy
+  (package
+    (name "go-github-com-golang-snappy")
+    (version "0.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/snappy")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
+       (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/golang/snappy"))
+    (home-page "https://github.com/golang/snappy")
+    (synopsis "Snappy compression format in the Go programming language")
+    (description "This package provides a Go implementation of the Snappy
+compression format.")
+    (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 3997f4057d..43e9024167 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -83,6 +83,7 @@ (define-module (gnu packages golang)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages lua)
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 9760084603..ad18a39738 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
@@ -48,7 +49,6 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages rsync)
-  #:use-module (gnu packages syncthing)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages version-control)
@@ -284,7 +284,7 @@ (define-public nsq
            go-github-com-bmizerany-perks-quantile
            go-github-com-burntsushi-toml
            go-github-com-davecgh-go-spew
-           go-github-com-golang-snappy ; Move to (gnu packages golang)
+           go-github-com-golang-snappy
            go-github-com-julienschmidt-httprouter
            go-github-com-mreiferson-go-options
            go-github-com-mreiferson-go-svc
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index ae514cd93b..f09d0190dd 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages ipfs)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages python)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4c3aa8f30b..c0270b87e5 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages python-crypto)
@@ -398,29 +399,6 @@ (define-public go-github-com-golang-groupcache-lru
       (home-page "https://github.com/golang/groupcache")
       (license asl2.0))))
 
-(define-public go-github-com-golang-snappy
-  (package
-    (name "go-github-com-golang-snappy")
-    (version "0.0.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/golang/snappy")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
-              (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/golang/snappy"))
-    (synopsis "Snappy compression format in the Go programming language")
-    (description "This package provides a Go implementation of the Snappy
-compression format.")
-    (home-page "https://github.com/golang/snappy")
-    (license bsd-3)))
-
 (define-public go-github-com-jackpal-gateway
   (package
     (name "go-github-com-jackpal-gateway")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 14/30] gnu: go-github-com-bitly-timer-metrics: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:446a908db9cf712b19faecb4d5e4bc91e8d3698f.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-bitly-timer-metrics): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Id30d1add9ccbfbc05af114f6ccf82f353a7aa74b

---

gnu/packages/golang-xyz.scm | 22 ++++++++++++++++++++++

gnu/packages/golang.scm | 23 -----------------------

2 files changed, 22 insertions(+), 23 deletions(-)

Toggle diff (69 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 292ff10a47..a396057da9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,28 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-bitly-timer-metrics
+  (package
+    (name "go-github-com-bitly-timer-metrics")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bitly/timer_metrics")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/bitly/timer_metrics"))
+    (home-page "https://github.com/bitly/timer_metrics")
+    (synopsis "Capture timings and enable periodic metrics every @var{n} events")
+    (description "This package provides an efficient way to capture timing
+information and periodically output metrics")
+    (license license:expat)))
+
 (define-public go-github-com-blang-semver
   (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41adf51bfb..d594759bdf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1906,29 +1906,6 @@ (define-public go-github-com-bitly-go-hostpool
 robin or epsilon greedy mode, and unresponsive hosts are avoided.")
     (license license:expat)))
 
-(define-public go-github-com-bitly-timer-metrics
-  (package
-    (name "go-github-com-bitly-timer-metrics")
-    (version "1.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/bitly/timer_metrics")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/bitly/timer_metrics"))
-    (home-page "https://github.com/bitly/timer_metrics")
-    (synopsis "Capture timings and enable periodic metrics every @var{n} events")
-    (description
-     "This package provides an efficient way to capture timing information and
-periodically output metrics")
-    (license license:expat)))
-
 (define-public go-github-com-blanu-dust
   (package
     (name "go-github-com-blanu-dust")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 15/30] gnu: go-github-com-bitly-go-hostpool: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e84bac076fc1c2a5e9d796f4c7db59a8fc7200e9.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-bitly-go-hostpool): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Ia314e6134f229c004f23d99a9c42dbd0adf105f8
---
 gnu/packages/golang-xyz.scm        | 25 +++++++++++++++++++++++++
 gnu/packages/golang.scm            | 25 -------------------------
 gnu/packages/high-availability.scm |  1 +
 3 files changed, 26 insertions(+), 25 deletions(-)

Toggle diff (86 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a396057da9..f3087149e7 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,31 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-bitly-go-hostpool
+  (package
+    (name "go-github-com-bitly-go-hostpool")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bitly/go-hostpool")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/bitly/go-hostpool"))
+    (native-inputs (list go-github-com-stretchr-testify))
+    (home-page "https://github.com/bitly/go-hostpool")
+    (synopsis "Pool among multiple hosts from Golang")
+    (description
+     "This package provides a Go package to intelligently and flexibly pool among
+multiple hosts from your Go application.  Host selection can operate in round
+robin or epsilon greedy mode, and unresponsive hosts are avoided.")
+    (license license:expat)))
+
 (define-public go-github-com-bitly-timer-metrics
   (package
     (name "go-github-com-bitly-timer-metrics")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d594759bdf..4a8e9dbc78 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1881,31 +1881,6 @@ (define-public go-github-com-dhowett-go-plist
 types.")
       (license license:giftware))))
 
-(define-public go-github-com-bitly-go-hostpool
-  (package
-    (name "go-github-com-bitly-go-hostpool")
-    (version "0.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/bitly/go-hostpool")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/bitly/go-hostpool"))
-    (native-inputs (list go-github-com-stretchr-testify))
-    (home-page "https://github.com/bitly/go-hostpool")
-    (synopsis "Pool among multiple hosts from Golang")
-    (description
-     "This package provides a Go package to intelligently and flexibly pool among
-multiple hosts from your Go application.  Host selection can operate in round
-robin or epsilon greedy mode, and unresponsive hosts are avoided.")
-    (license license:expat)))
-
 (define-public go-github-com-blanu-dust
   (package
     (name "go-github-com-blanu-dust")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 0678edaf4e..b0e6631389 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 17/30] gnu: go-golang-org-x-mod: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:d6ef4a733b6c0f0cd62de3be3e4be603d401de3a.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-mod): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/shellutils.scm: Add (gnu packages golang-build) module.

Change-Id: I88ce7ac1e264cb545a272f9c8a485747e84f7c82

---

gnu/packages/golang-build.scm | 36 +++++++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 34 ---------------------------------

gnu/packages/shellutils.scm | 1 +

3 files changed, 37 insertions(+), 34 deletions(-)

Toggle diff (112 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index ffedc946c2..a8e97e7acb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
@@ -67,6 +69,40 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-mod
+  (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-mod")
+      (version (git-version "0.7.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/golang/mod")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "golang.org/x/mod/"
+         #:tests? #f
+         #:phases (modify-phases %standard-phases
+                    ;; Source-only package
+                    (delete 'build))))
+      (home-page "https://golang.org/x/mod")
+      (synopsis "Tools to work directly with Go module mechanics")
+      (description
+       "This repository holds packages for writing tools that work directly
+with Go module mechanics.  That is, it is for direct manipulation of Go
+modules themselves.
+
+The specific case of loading packages should still be done by invoking the
+@command{go} command, which remains the single point of truth for package
+loading algorithms.")
+      (license license:bsd-3))))
+
 (define-public go-golang-org-x-net
   (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index dd0ac7e3e8..e7b98028a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3699,40 +3699,6 @@ (define-public go-golang-org-x-xerrors
       (home-page "https://godoc.org/golang.org/x/xerrors")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-mod
-  (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-mod")
-      (version (git-version "0.7.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/golang/mod")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/mod/"
-         #:tests? #f
-         #:phases (modify-phases %standard-phases
-                    ;; Source-only package
-                    (delete 'build))))
-      (home-page "https://golang.org/x/mod")
-      (synopsis "Tools to work directly with Go module mechanics")
-      (description
-       "This repository holds packages for writing tools that work directly
-with Go module mechanics.  That is, it is for direct manipulation of Go modules
-themselves.
-
-The specific case of loading packages should still be done by invoking the
-@command{go} command, which remains the single point of truth for package
-loading algorithms.")
-      (license license:bsd-3))))
-
 (define-public go-github-com-hashicorp-go-uuid
   (package
     (name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 48c5250c8c..e58e9e61fc 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
   #:use-module (gnu packages check)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages ncurses)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 18/30] gnu: go-golang-org-x-xerrors: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:0c9fd02cce79ca7408cb4572b9bb5d040f16d649.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-xerrors): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: I68c9aa1607d71d08eb7ea4e5caf27121cdd0df4c

---

gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

2 files changed, 25 insertions(+), 24 deletions(-)

Toggle diff (79 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index a8e97e7acb..fed606e8fb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -195,6 +196,30 @@ (define-public go-golang-org-x-sys
 support for low-level interaction with the operating system.")
       (license license:bsd-3))))
 
+(define-public go-golang-org-x-xerrors
+  (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-xerrors")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/xerrors")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "golang.org/x/xerrors"))
+      (home-page "https://godoc.org/golang.org/x/xerrors")
+      (synopsis "Go 1.13 error values")
+      (description "This package holds the transition packages for the new Go
+1.13 error values.")
+      (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 e7b98028a5..68b905ff8b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3675,30 +3675,6 @@ (define-public go-golang-org-x-oauth2
  spec in Go.")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-xerrors
-  (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-xerrors")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/xerrors")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/xerrors"))
-      (synopsis "Go 1.13 error values")
-      (description
-       "This package holds the transition packages for the new Go 1.13 error values.")
-      (home-page "https://godoc.org/golang.org/x/xerrors")
-      (license license:bsd-3))))
-
 (define-public go-github-com-hashicorp-go-uuid
   (package
     (name "go-github-com-hashicorp-go-uuid")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 19/30] gnu: go-golang.org-x-sync-errgroup: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:a1cc4c9efacc846ba837e4f03bee89d4ac0f4a1d.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang.org-x-sync-errgroup,

go-golang.org-x-sync-semaphore): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/check.scm: Add (gnu packages golang-build) module.

Change-Id: Ie886c0f44e0a70629e23371b447f5a35006ade21

---

gnu/packages/check.scm | 1 +

gnu/packages/golang-build.scm | 41 +++++++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 38 --------------------------------

gnu/packages/terminals.scm | 1 +

4 files changed, 43 insertions(+), 38 deletions(-)

Toggle diff (139 lines)diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4f593cde8d..b520d6c58a 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages check)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index fed606e8fb..8e64571929 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,11 +1,14 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -165,6 +168,44 @@ (define-public go-golang-org-x-net-html
     (description
      "This package provides an HTML5-compliant tokenizer and parser.")))
 
+(define-public go-golang.org-x-sync-errgroup
+  (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
+        (revision "0"))
+    (package
+      (name "go-golang.org-x-sync-errgroup")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/sync")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "golang.org/x/sync/errgroup"
+         #:unpack-path "golang.org/x/sync"))
+      (home-page "https://godoc.org/golang.org/x/sync/errgroup")
+      (synopsis "Synchronization, error propagation, and Context cancellation
+for groups of goroutines working on subtasks of a common task")
+      (description "This package provides synchronization, error
+propagation, and Context cancellation for groups of goroutines working on
+subtasks of a common task.")
+      (license license:bsd-3))))
+
+(define-public go-golang.org-x-sync-semaphore
+  (package
+    (inherit go-golang.org-x-sync-errgroup)
+    (name "go-golang.org-x-sync-semaphore")
+    (arguments
+     '(#:import-path "golang.org/x/sync/semaphore"
+       #:unpack-path "golang.org/x/sync"))
+    (home-page "https://godoc.org/golang.org/x/sync/semaphore")
+    (synopsis "Weighted semaphore implementation in Go")
+    (description "Weighted semaphore implementation in Go.")))
+
 (define-public go-golang-org-x-sys
   (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 68b905ff8b..7e5626a303 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7023,44 +7023,6 @@ (define-public go-github-com-google-renameio
 create or replace a file or symbolic link.")
     (license license:asl2.0)))
 
-(define-public go-golang.org-x-sync-errgroup
-  (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
-        (revision "0"))
-    (package
-      (name "go-golang.org-x-sync-errgroup")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://go.googlesource.com/sync")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/sync/errgroup"
-         #:unpack-path "golang.org/x/sync"))
-      (synopsis "Synchronization, error propagation, and Context cancellation
-for groups of goroutines working on subtasks of a common task")
-      (description "This package provides synchronization, error propagation,
-and Context cancellation for groups of goroutines working on subtasks of a
-common task.")
-      (home-page "https://godoc.org/golang.org/x/sync/errgroup")
-      (license license:bsd-3))))
-
-(define-public go-golang.org-x-sync-semaphore
-  (package
-    (inherit go-golang.org-x-sync-errgroup)
-    (name "go-golang.org-x-sync-semaphore")
-    (arguments
-     '(#:import-path "golang.org/x/sync/semaphore"
-       #:unpack-path "golang.org/x/sync"))
-    (synopsis "Weighted semaphore implementation in Go")
-    (description "Weighted semaphore implementation in Go.")
-    (home-page "https://godoc.org/golang.org/x/sync/semaphore")))
-
 (define (go-gotest-tools-source version sha256-base32-hash)
   (origin
     (method git-fetch)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f609de8eff..37223d0d18 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -90,6 +90,7 @@ (define-module (gnu packages terminals)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libcanberra)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 23/30] gnu: go-golang-org-x-text: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:adc9806a230f761815015fc98ab3aa1c60c6282e.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-text): Move from here ...
* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/admin.scm: Add (gnu packages golang-build) module.
* gnu/packages/bioinformatics.scm: As above.
* gnu/packages/mail.scm: As above.

Change-Id: Ifd15b35b460ae30c5c1d677551e95842b322b246
---
 gnu/packages/admin.scm          |  1 +
 gnu/packages/bioinformatics.scm |  1 +
 gnu/packages/golang-build.scm   | 29 +++++++++++++++++++++++++++++
 gnu/packages/golang.scm         | 28 ----------------------------
 gnu/packages/mail.scm           |  1 +
 5 files changed, 32 insertions(+), 28 deletions(-)

Toggle diff (122 lines)diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2dbb604fa9..c595e1270f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -130,6 +130,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 554df0b42f..08683bc8e9 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages graph)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 3885701078..325470ca4e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
@@ -292,6 +293,34 @@ (define-public go-golang-org-x-term
 terminals, as commonly found on Unix systems.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-text
+  (package
+    (name "go-golang-org-x-text")
+    (version "0.3.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/text")
+             (commit (string-append "v" version))))
+       (file-name (string-append "go.googlesource.com-text-"
+                                 version "-checkout"))
+       (sha256
+        (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "golang.org/x/text"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build))))
+    (home-page "https://go.googlesource.com/text")
+    (synopsis "Supplemental Go text processing libraries")
+    (description "This package provides supplemental Go libraries for text
+processing.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-time
   (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
         (revision "2"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6c056e19a9..eb4740f91e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,34 +3559,6 @@ (define-public go-golang-org-x-image
 processing.")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-text
-  (package
-    (name "go-golang-org-x-text")
-    (version "0.3.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/text")
-                    (commit (string-append "v" version))))
-              (file-name (string-append "go.googlesource.com-text-"
-                                        version "-checkout"))
-              (sha256
-               (base32
-                "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "golang.org/x/text"
-       ; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))
-    (synopsis "Supplemental Go text processing libraries")
-    (description "This package provides supplemental Go libraries for text
-    processing.")
-    (home-page "https://go.googlesource.com/text")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-oauth2
   (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
         (revision "1"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 76f379a710..4a439d2f8f 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 24/30] gnu: go-github-com-yuin-goldmark: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:b84f4cdac0d7dc73ef5c9344616f01e223f08358.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-yuin-goldmark): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: If553b4a00b288a913d1d54da8b5b52eab87bb277

---

gnu/packages/golang-build.scm | 22 ++++++++++++++++++++++

gnu/packages/golang.scm | 21 ---------------------

2 files changed, 22 insertions(+), 21 deletions(-)

Toggle diff (74 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 325470ca4e..b2b2872907 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -51,6 +52,27 @@ (define-module (gnu packages golang-build)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-yuin-goldmark
+  (package
+    (name "go-github-com-yuin-goldmark")
+    (version "1.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/yuin/goldmark")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/yuin/goldmark"))
+    (home-page "https://github.com/yuin/goldmark/")
+    (synopsis "Markdown parser")
+    (description "This package provides a markdown parser.")
+    (license license:expat)))
+
 (define-public go-golang-org-x-exp
   (package
     (name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eb4740f91e..22a76daef4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7925,27 +7925,6 @@ (define-public go-github-com-olekukonko-ts
 size of the terminal.")
       (license license:expat))))
 
-(define-public go-github-com-yuin-goldmark
-  (package
-    (name "go-github-com-yuin-goldmark")
-    (version "1.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/yuin/goldmark")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/yuin/goldmark"))
-    (home-page "https://github.com/yuin/goldmark/")
-    (synopsis "Markdown parser")
-    (description "This package provides a markdown parser.")
-    (license license:expat)))
-
 (define-public go-github-com-charmbracelet-glamour
   (package
     (name "go-github-com-charmbracelet-glamour")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 28/30] gnu: go-github-com-klauspost-compress: Move to (gnu packages-compression).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e2fe342565663d5aee18181c207b9ad8d622da23.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-klauspost-compress): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.

* gnu/packages/golang-compression.scm: Add (gnu packages
golang-compression) module.
* gnu/packages/golang-crypto.scm: As above.
* gnu/packages/golang-web.scm: As above.
* gnu/packages/uucp.scm: As above.

Change-Id: Ia99f1e6aae7f75940fc150eb02862c0b3e9f3325
---
 gnu/packages/golang-compression.scm | 31 ++++++++++++++++++++++++++++
 gnu/packages/golang-crypto.scm      |  3 ++-
 gnu/packages/golang-web.scm         |  1 +
 gnu/packages/golang.scm             | 32 -----------------------------
 gnu/packages/uucp.scm               |  1 +
 5 files changed, 35 insertions(+), 33 deletions(-)

Toggle diff (125 lines)diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 670572ea90..5aacc34a66 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -56,6 +56,37 @@ (define-public go-github-com-golang-snappy
 compression format.")
     (license license:bsd-3)))
 
+(define-public go-github-com-klauspost-compress
+  (package
+    (name "go-github-com-klauspost-compress")
+    (version "1.13.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/klauspost/compress")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/klauspost/compress"
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'reset-gzip-timestamps 'fix-permissions
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Provide write permissions on gzip files so that
+             ;; reset-gzip-timestamps has sufficient permissions.
+             (for-each make-file-writable
+                       (find-files (assoc-ref outputs "out") ".gz$")))))))
+    (propagated-inputs
+     (list go-github-com-golang-snappy))
+    (home-page "https://github.com/klauspost/compress")
+    (synopsis "Go compression library")
+    (description "@code{compress} provides various compression algorithms.")
+    (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-crypto.scm b/gnu/packages/golang-crypto.scm
index 39e7412558..58fd9cb250 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -45,7 +45,8 @@ (define-module (gnu packages golang-crypto)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
-  #:use-module (gnu packages golang-check))
+  #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d7fb7dd366..28a9fad113 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages golang-web)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages tls)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e473c0880b..24ca39fc58 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9477,38 +9477,6 @@ (define-public go-github-com-dustin-go-humanize
 back.")
     (license license:expat)))
 
-(define-public go-github-com-klauspost-compress
-  (package
-    (name "go-github-com-klauspost-compress")
-    (version "1.13.1")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/klauspost/compress")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/klauspost/compress"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'reset-gzip-timestamps 'fix-permissions
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Provide write permissions on gzip files so that
-             ;; reset-gzip-timestamps has sufficient permissions.
-             (for-each make-file-writable
-                       (find-files (assoc-ref outputs "out") ".gz$")))))))
-    (propagated-inputs
-     (list go-github-com-golang-snappy))
-    (home-page "https://github.com/klauspost/compress")
-    (synopsis "Go compression library")
-    (description "@code{compress} provides various compression algorithms.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-oneofone-xxhash
   (package
     (name "go-github-com-oneofone-xxhash")
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 8f1759556e..8e47834fef 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -20,6 +20,7 @@
 (define-module (gnu packages uucp)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages texinfo)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 27/30] gnu: go-golang-org-x-crypto: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:a073978e972dd56d51c9d0fa18c85891059c1bcc.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-crypto): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/backup.scm: Add (gnu packages golang-build) module.

* gnu/packages/crypto.scm: As above.

Change-Id: I5daad7fe90e1507958fe73c04fc043ebbc006395

---

gnu/packages/backup.scm | 1 +

gnu/packages/crypto.scm | 1 +

gnu/packages/golang-build.scm | 34 +++++++++++++++++++++++++++++++++-

gnu/packages/golang.scm | 31 -------------------------------

4 files changed, 35 insertions(+), 32 deletions(-)

Toggle diff (127 lines)diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index f160efd37d..3b3b9d332a 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages backup)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index c7145bcb0c..6857ea2075 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -60,6 +60,7 @@ (define-module (gnu packages crypto)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kerberos)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b717c3ad27..8b7dca46a6 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,14 +1,15 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
+;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
-;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
@@ -74,6 +75,37 @@ (define-public go-github-com-yuin-goldmark
     (description "This package provides a markdown parser.")
     (license license:expat)))
 
+(define-public go-golang-org-x-crypto
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/crypto")
+             (commit (string-append "v" version))))
+       (file-name (string-append "go.googlesource.com-crypto-"
+                                 version "-checkout"))
+       (sha256
+        (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; Source-only package
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (home-page "https://go.googlesource.com/crypto/")
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
+for the Go language.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-exp
   (package
     (name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0437b4e83d..e473c0880b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,37 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
-(define-public go-golang-org-x-crypto
-  (package
-    (name "go-golang-org-x-crypto")
-    (version "0.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/crypto")
-                    (commit (string-append "v" version))))
-              (file-name (string-append "go.googlesource.com-crypto-"
-                                        version "-checkout"))
-              (sha256
-               (base32
-                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "golang.org/x/crypto"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
-    (propagated-inputs
-     (list go-golang-org-x-sys))
-    (synopsis "Supplementary cryptographic libraries in Go")
-    (description "This package provides supplementary cryptographic libraries
-for the Go language.")
-    (home-page "https://go.googlesource.com/crypto/")
-    (license license:bsd-3)))
-
 (define-public govulncheck
   (package
     (name "govulncheck")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 30/30] gnu: go-github.com-ulikunitz-xz: Move to (gnu packages-compression).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:664cadcc7212c886524fa94bf498f9594ea66082.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github.com-ulikunitz-xz): Move from here ...

* gnu/packages/golang-compression.scm: ... to here.

* gnu/packages/admin.scm: Add (gnu packages golang-compression) module.

* gnu/packages/bioinformatics.scm: As above.

Change-Id: I1901e67ac4336efd356085332572b3f09de90f7a

---

gnu/packages/admin.scm | 1 +

gnu/packages/bioinformatics.scm | 1 +

gnu/packages/golang-compression.scm | 23 +++++++++++++++++++++++

gnu/packages/golang.scm | 22 ----------------------

4 files changed, 25 insertions(+), 22 deletions(-)

Toggle diff (99 lines)diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c595e1270f..11f69e57a4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -131,6 +131,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 08683bc8e9..bcfe3c2656 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -95,6 +95,7 @@ (define-module (gnu packages bioinformatics)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages graph)
   #:use-module (gnu packages graphics)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 6a556daa25..568fdd12b9 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -114,6 +115,28 @@ (define-public go-github-com-klauspost-compress
     (description "@code{compress} provides various compression algorithms.")
     (license license:bsd-3)))
 
+(define-public go-github.com-ulikunitz-xz
+  (package
+    (name "go-github.com-ulikunitz-xz")
+    (version "0.5.8")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ulikunitz/xz.git")
+             (commit (string-append "v" version))))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32 "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/ulikunitz/xz"))
+    (home-page "https://github.com/ulikunitz/xz")
+    (synopsis "Read and write xz compressed streams in Go")
+    (description "This package provides a library to read and write xz
+compressed streams in Go.")
+    (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 644121a761..7d1ae9699b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8968,28 +8968,6 @@ (define-public go-github-com-tekwizely-go-parsing
 parsers, and related tools.")
       (license license:expat))))
 
-(define-public go-github.com-ulikunitz-xz
-  (package
-    (name "go-github.com-ulikunitz-xz")
-    (version "0.5.8")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/ulikunitz/xz.git")
-                    (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/ulikunitz/xz"))
-    (synopsis "Read and write xz compressed streams in Go")
-    (description "This package provides a library to read and write xz
-compressed streams in Go.")
-    (home-page "https://github.com/ulikunitz/xz")
-    (license license:bsd-3)))
-
 (define-public go-github-com-songmu-gitconfig
   (package
     (name "go-github-com-songmu-gitconfig")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 06/30] gnu: go-golang-org-x-sys: Move to (gnu packages golang-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e3e2bea0c3bc80efdf176ad38a47f0f34f024b2c.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-sys): Move
from here ...
* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/curl.scm: Add (gnu packages golang-build) module.
* gnu/packages/databases.scm: As above.
* gnu/packages/docker.scm: As above.
* gnu/packages/golang-build.scm: As above.
* gnu/packages/golang.scm: As above.
* gnu/packages/irc.scm: As above.
* gnu/packages/linux.scm: As above.
* gnu/packages/password-utils.scm: As above.
* gnu/packages/syncthing.scm: As above.
* gnu/packages/textutils.scm: As above.
* gnu/packages/vpn.scm: As above.
* gnu/packages/weather.scm: As above.
* gnu/packages/web.scm: As above.

Change-Id: I161e89cacb9aa87b4fbb643ecd9ad32cfe49c9d7
---
 gnu/packages/curl.scm           |  1 +
 gnu/packages/databases.scm      |  1 +
 gnu/packages/docker.scm         |  1 +
 gnu/packages/golang-build.scm   | 31 +++++++++++++++++++++++++++++++
 gnu/packages/golang.scm         | 31 -------------------------------
 gnu/packages/irc.scm            |  1 +
 gnu/packages/linux.scm          |  1 +
 gnu/packages/password-utils.scm |  1 +
 gnu/packages/syncthing.scm      |  1 +
 gnu/packages/textutils.scm      |  1 +
 gnu/packages/vpn.scm            |  1 +
 gnu/packages/weather.scm        |  3 ++-
 gnu/packages/web.scm            |  1 +
 13 files changed, 43 insertions(+), 32 deletions(-)

Toggle diff (220 lines)diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 0fb83a7a12..02a602a66d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages curl)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages logging)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 903088ed4b..dc4a91f14d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -107,6 +107,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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index fbe8edeef0..0fe1f2c1c7 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages docker)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 2601dec27a..eeab951f1e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -101,6 +101,37 @@ (define-public go-golang-org-x-net-html
     (description
      "This package provides an HTML5-compliant tokenizer and parser.")))
 
+(define-public go-golang-org-x-sys
+  (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-sys")
+      (version (git-version "0.8.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/sys")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:import-path "golang.org/x/sys"
+        ;; Source-only package
+        #:tests? #f
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; Source-only package
+            (delete 'build))))
+      (home-page "https://go.googlesource.com/sys")
+      (synopsis "Go support for low-level system interaction")
+      (description "This package provides supplemental libraries offering Go
+support for low-level interaction with the operating system.")
+      (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 73e7077eac..373b57c5ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3712,37 +3712,6 @@ (define-public go-golang-org-x-sync
       (home-page "https://go.googlesource.com/sync/")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-sys
-  (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-sys")
-      (version (git-version "0.8.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/sys")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
-      (build-system go-build-system)
-      (arguments
-       (list
-        #:import-path "golang.org/x/sys"
-        ;; Source-only package
-        #:tests? #f
-        #:phases
-        #~(modify-phases %standard-phases
-            ;; Source-only package
-            (delete 'build))))
-      (synopsis "Go support for low-level system interaction")
-      (description "This package provides supplemental libraries offering Go
-support for low-level interaction with the operating system.")
-      (home-page "https://go.googlesource.com/sys")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 3200ccc135..c211fa6595 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b8b119e474..d798c44a8f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -134,6 +134,7 @@ (define-module (gnu packages linux)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 6dc257dc0e..3a2bb410f2 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -91,6 +91,7 @@ (define-module (gnu packages password-utils)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index c0270b87e5..dbca1e5e90 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index be5cb15cb8..25de916fcb 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages textutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages java)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 02c1ee1043..5df50280c3 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -70,6 +70,7 @@ (define-module (gnu packages vpn)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm
index 6ba656017f..5a58b97a30 100644
--- a/gnu/packages/weather.scm
+++ b/gnu/packages/weather.scm
@@ -22,7 +22,8 @@ (define-module (gnu packages weather)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (gnu packages)
-  #:use-module (gnu packages golang))
+  #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build))
 
 (define-public wego
   (package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a1039b9e0c..0c67e7d6e4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -143,6 +143,7 @@ (define-module (gnu packages web)
   #:use-module (gnu packages gnunet)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 07/30] gnu: go-github-com-mreiferson-go-svc: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:ded24e275588ee354eb7dd0542d3db80c4fcbb4d.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-mreiferson-go-svc): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I21f1d5f651fb09a3716cbcdb48aaf7f8dd37384d

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

gnu/packages/golang.scm | 28 ----------------------------

2 files changed, 28 insertions(+), 28 deletions(-)

Toggle diff (80 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ebcf333b13..aefe0e0d9c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -170,6 +170,34 @@ (define-public go-github-com-mreiferson-go-options
 command line flags, config files, and default struct values.")
     (license license:expat)))
 
+(define-public go-github-com-mreiferson-go-svc
+  ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
+  ;; does not support go.mod with `replace' statement.
+  (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
+        (revision "0"))
+    (package
+      (name "go-github-com-mreiferson-go-svc")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mreiferson/go-svc")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/judwhite/go-svc"))
+      (propagated-inputs (list go-golang-org-x-sys))
+      (home-page "https://github.com/mreiferson/go-svc")
+      (synopsis "Go Windows Service wrapper for GNU/Linux")
+      (description
+       "Go Windows Service wrapper compatible with GNU/Linux.  Windows tests
+@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
+      (license license:expat))))
+
 (define-public go-github-com-nats-io-nats-go
   (package
     (name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 373b57c5ad..5887d68630 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5484,34 +5484,6 @@ (define-public go-github-com-mr-tron-base58
 encoding and 8 times faster decoding.")
       (license license:expat))))
 
-(define-public go-github-com-mreiferson-go-svc
-  ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
-  ;; does not support go.mod with `replace' statement.
-  (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
-        (revision "0"))
-    (package
-      (name "go-github-com-mreiferson-go-svc")
-      (version (git-version "1.2.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/mreiferson/go-svc")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/judwhite/go-svc"))
-      (propagated-inputs (list go-golang-org-x-sys))
-      (home-page "https://github.com/mreiferson/go-svc")
-      (synopsis "Go Windows Service wrapper for GNU/Linux")
-      (description
-       "Go Windows Service wrapper compatible with GNU/Linux.  Windows tests
-@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
-      (license license:expat))))
-
 (define-public go-github-com-spaolacci-murmur3
   (package
     (name "go-github-com-spaolacci-murmur3")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 08/30] gnu: go-github-com-nsqio-go-nsq: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e593be8a32fe848b0fe91c8a5c83b817a99c8484.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-nsqio-go-nsq): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Ie718c9943dd527281b30c78ab4e23adc764289c1

---

gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++

gnu/packages/golang.scm | 26 --------------------------

2 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (84 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index aefe0e0d9c..bbf72f1105 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages golang-xyz)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto))
 
 ;;; Commentary:
@@ -249,6 +250,32 @@ (define-public go-github-com-nats-io-nuid
 very fast, and tries to be entropy pool friendly.")
     (license license:asl2.0)))
 
+(define-public go-github-com-nsqio-go-nsq
+  (package
+    (name "go-github-com-nsqio-go-nsq")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nsqio/go-nsq")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:tests? #f                  ;tests require networking
+           #:import-path "github.com/nsqio/go-nsq"))
+    (propagated-inputs (list go-github-com-golang-snappy))
+    (home-page "https://github.com/nsqio/go-nsq")
+    (synopsis "Consumer/producer library for NSQ")
+    (description
+     "The @code{nsq} Go module provides a high-level @code{Consumer} and
+@code{Producer} types as well as low-level functions to communicate over the
+NSQ protocol @url{https://nsq.io/}.")
+    (license license:expat)))
+
 (define-public go-go-uber-org-automaxprocs
   (package
     (name "go-go-uber-org-automaxprocs")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5887d68630..b8b5a67613 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3098,32 +3098,6 @@ (define-public go-github-com-nsqio-go-diskqueue
 queue.")
     (license license:expat)))
 
-(define-public go-github-com-nsqio-go-nsq
-  (package
-    (name "go-github-com-nsqio-go-nsq")
-    (version "1.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/nsqio/go-nsq")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:tests? #f                  ;tests require networking
-           #:import-path "github.com/nsqio/go-nsq"))
-    (propagated-inputs (list go-github-com-golang-snappy))
-    (home-page "https://github.com/nsqio/go-nsq")
-    (synopsis "Consumer/producer library for NSQ")
-    (description
-     "The @code{nsq} Go module provides a high-level @code{Consumer} and
-@code{Producer} types as well as low-level functions to communicate over the
-NSQ protocol @url{https://nsq.io/}.")
-    (license license:expat)))
-
 (define-public go-github-com-hebcal-gematriya
   (let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
         (revision "0"))
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 09/30] gnu: go-github-com-nsqio-go-diskqueue: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:680e433ab7746597a3d220f12c0012da6a60e89b.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-nsqio-go-diskqueue): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I2051eb1f8a40eeab9c8cc96c540413f5818dd78e

---

gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++

gnu/packages/golang.scm | 23 -----------------------

2 files changed, 23 insertions(+), 23 deletions(-)

Toggle diff (70 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index bbf72f1105..1999aab7fb 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -250,6 +250,29 @@ (define-public go-github-com-nats-io-nuid
 very fast, and tries to be entropy pool friendly.")
     (license license:asl2.0)))
 
+(define-public go-github-com-nsqio-go-diskqueue
+  (package
+    (name "go-github-com-nsqio-go-diskqueue")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nsqio/go-diskqueue")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/nsqio/go-diskqueue"))
+    (home-page "https://github.com/nsqio/go-diskqueue")
+    (synopsis "Go package providing a file system backed FIFO queue")
+    (description
+     "The @code{diskqueue} Go package provides a file system backed FIFO
+queue.")
+    (license license:expat)))
+
 (define-public go-github-com-nsqio-go-nsq
   (package
     (name "go-github-com-nsqio-go-nsq")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b8b5a67613..599fdf9f2d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3075,29 +3075,6 @@ (define-public go-github-com-nathan-osman-go-sunrise
 sunset times from geographical coordinates and a date.")
       (license license:expat))))
 
-(define-public go-github-com-nsqio-go-diskqueue
-  (package
-    (name "go-github-com-nsqio-go-diskqueue")
-    (version "1.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/nsqio/go-diskqueue")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/nsqio/go-diskqueue"))
-    (home-page "https://github.com/nsqio/go-diskqueue")
-    (synopsis "Go package providing a file system backed FIFO queue")
-    (description
-     "The @code{diskqueue} Go package provides a file system backed FIFO
-queue.")
-    (license license:expat)))
-
 (define-public go-github-com-hebcal-gematriya
   (let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
         (revision "0"))
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 10/30] gnu: go-github-com-davecgh-go-spew: Move to (gnu packages golang-check).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:178825daa3ef225c9dc1c8b7cf2a86b7786db0ed.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-davecgh-go-spew): Move

from here ...

* gnu/packages/golang-check.scm: ... to here.

* gnu/packages/high-availability.scm: Add (gnu packages golang-check) module.

Change-Id: I935006c3656b7bf18b91e529296778672338f094

---

gnu/packages/golang-check.scm | 38 ++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 38 ------------------------------

gnu/packages/high-availability.scm | 1 +

3 files changed, 39 insertions(+), 38 deletions(-)

Toggle diff (112 lines)diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 2decd1f664..c5e30f7fe1 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -124,6 +124,44 @@ (define-public go-github-com-cheekybits-is
 @end itemize\n")
       (license license:expat))))
 
+(define-public go-github-com-davecgh-go-spew
+  (package
+    (name "go-github-com-davecgh-go-spew")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/davecgh/go-spew")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:unpack-path "github.com/davecgh/go-spew"
+       #:import-path "github.com/davecgh/go-spew/spew"))
+    (home-page "https://github.com/davecgh/go-spew")
+    (synopsis "Deep pretty printer for Go data structures to aid in debugging")
+    (description "Package @command{spew} implements a deep pretty printer
+for Go data structures to aid in debugging.
+
+A quick overview of the additional features spew provides over the built-in
+printing facilities for Go data types are as follows:
+
+@itemize
+@item Pointers are dereferenced and followed.
+@item Circular data structures are detected and handled properly.
+@item Custom Stringer/error interfaces are optionally invoked, including on
+unexported types.
+@item Custom types which only implement the Stringer/error interfaces via a
+pointer receiver are optionally invoked when passing non-pointer variables.
+@item Byte arrays and slices are dumped like the hexdump -C command which
+includes offsets, byte values in hex, and ASCII output (only when using Dump
+style).
+@end itemize")
+    (license license:isc)))
+
 (define-public go-github-com-frankban-quicktest
   (package
     (name "go-github-com-frankban-quicktest")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 599fdf9f2d..903f2126c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5344,44 +5344,6 @@ (define-public go-github-com-libp2p-go-flow-metrics
 that's a lot faster (and only does simple bandwidth metrics).")
       (license license:expat))))
 
-(define-public go-github-com-davecgh-go-spew
-  (package
-    (name "go-github-com-davecgh-go-spew")
-    (version "1.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/davecgh/go-spew")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:unpack-path "github.com/davecgh/go-spew"
-       #:import-path "github.com/davecgh/go-spew/spew"))
-    (home-page "https://github.com/davecgh/go-spew")
-    (synopsis "Deep pretty printer for Go data structures to aid in debugging")
-    (description "Package @command{spew} implements a deep pretty printer
-for Go data structures to aid in debugging.
-
-A quick overview of the additional features spew provides over the built-in printing facilities for Go data types are as follows:
-
-@itemize
-@item Pointers are dereferenced and followed.
-@item Circular data structures are detected and handled properly.
-@item Custom Stringer/error interfaces are optionally invoked, including on
-unexported types.
-@item Custom types which only implement the Stringer/error interfaces via a
-pointer receiver are optionally invoked when passing non-pointer variables.
-@item Byte arrays and slices are dumped like the hexdump -C command which
-includes offsets, byte values in hex, and ASCII output (only when using Dump
-style).
-@end itemize\n")
-    (license license:isc)))
-
 (define-public go-github-com-btcsuite-btclog
   (let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a")
         (revision "0"))
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index ad18a39738..0678edaf4e 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 21/30] gnu: go-golang-org-x-term: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:09d9e479a874e8f0dc9c15f3e0610d6b7aaa3446.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-term): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/disk.scm: Add (gnu packages golang-build) module.

* gnu/packages/image-viewers.scm: As above.

Change-Id: Ibdb637bb129437ef74a0270fd44edc8804bb3055

---

gnu/packages/disk.scm | 1 +

gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

gnu/packages/image-viewers.scm | 1 +

4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (109 lines)diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 165f0a8a74..b0117d77ce 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages disk)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 7b8653960d..db94ad2c7b 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -4,11 +4,13 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -267,6 +269,29 @@ (define-public go-golang-org-x-sys
 support for low-level interaction with the operating system.")
       (license license:bsd-3))))
 
+(define-public go-golang-org-x-term
+  (package
+    (name "go-golang-org-x-term")
+    (version "0.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/term")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "golang.org/x/term"))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (home-page "https://pkg.go.dev/golang.org/x/term")
+    (synopsis "Go terminal/console support")
+    (description "@code{term} provides support functions for dealing with
+terminals, as commonly found on Unix systems.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-xerrors
   (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8bfabb9da9..240c87c3ba 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9659,30 +9659,6 @@ (define-public go-github-com-dustin-go-humanize
 back.")
     (license license:expat)))
 
-(define-public go-golang-org-x-term
-  (package
-    (name "go-golang-org-x-term")
-    (version "0.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://go.googlesource.com/term")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
-    (build-system go-build-system)
-    (arguments '(#:import-path "golang.org/x/term"))
-    (propagated-inputs
-     (list go-golang-org-x-sys))
-    (home-page "https://pkg.go.dev/golang.org/x/term")
-    (synopsis "Go terminal/console support")
-    (description "@code{term} provides support functions for dealing with
-terminals, as commonly found on Unix systems.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-klauspost-compress
   (package
     (name "go-github-com-klauspost-compress")
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 206b91c878..f2b87268f0 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages image-viewers)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages image)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 26/30] gnu: go-golang-org-x-image: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:14b7c206dd26f57f8dee48d2affd70b83f46a4da.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-image): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/game.scm: Add (gnu packages golang-build) module.

Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede

---

gnu/packages/games.scm | 1 +

gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 30 ------------------------------

3 files changed, 32 insertions(+), 30 deletions(-)

Toggle diff (104 lines)diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f95681fbb7..c257a2cfe8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -150,6 +150,7 @@ (define-module (gnu packages games)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages graphviz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 87f184fb14..b717c3ad27 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -99,6 +100,36 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-image
+  (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
+        (revision "1"))
+    (package
+      (name "go-golang-org-x-image")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/image")
+               (commit commit)))
+         (file-name (string-append "go.googlesource.com-image-"
+                                   version "-checkout"))
+         (sha256
+          (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
+      (build-system go-build-system)
+      (arguments
+       `(#:import-path "golang.org/x/image"
+         ;; Source-only package
+         #:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'build))))
+      (home-page "https://go.googlesource.com/image")
+      (synopsis "Supplemental Go image libraries")
+      (description "This package provides supplemental Go libraries for image
+processing.")
+      (license license:bsd-3))))
+
 (define-public go-golang-org-x-mod
   (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4c2781bf45..0437b4e83d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3488,36 +3488,6 @@ (define-public gopls
 editor.")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-image
-  (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
-        (revision "1"))
-    (package
-      (name "go-golang-org-x-image")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://go.googlesource.com/image")
-                       (commit commit)))
-                (file-name (string-append "go.googlesource.com-image-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/image"
-         ; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'build))))
-      (home-page "https://go.googlesource.com/image")
-      (synopsis "Supplemental Go image libraries")
-      (description "This package provides supplemental Go libraries for image
-processing.")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-oauth2
   (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
         (revision "1"))
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 11/30] gnu: go-github-com-burntsushi-toml: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:aeef33d45dd50cf2adb2e789c082f10f81618443.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-burntsushi-toml): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/golang-check.scm: Add (gnu packages golang-xyz) module.
* gnu/packages/golang.scm: As above.
* gnu/packages/shellutils.scm: As above.

Change-Id: If8a645431a1fb17159681daae70db49fd21b37c1
---
 gnu/packages/golang-check.scm |  3 ++-
 gnu/packages/golang-xyz.scm   | 26 ++++++++++++++++++++++++++
 gnu/packages/golang.scm       | 24 +-----------------------
 gnu/packages/shellutils.scm   |  1 +
 4 files changed, 30 insertions(+), 24 deletions(-)

Toggle diff (113 lines)diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index c5e30f7fe1..8ce85421e9 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -42,7 +42,8 @@ (define-module (gnu packages golang-check)
   #:use-module (guix git-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
-  #:use-module (gnu packages golang-build))
+  #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-xyz))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1999aab7fb..9d2b43b86c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +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 © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -41,6 +44,29 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-burntsushi-toml
+  (package
+    (name "go-github-com-burntsushi-toml")
+    (version "1.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/BurntSushi/toml")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/BurntSushi/toml"))
+    (home-page "https://github.com/BurntSushi/toml")
+    (synopsis "Toml parser and encoder for Go")
+    (description
+     "This package is toml parser and encoder for Go.  The interface is
+similar to Go's standard library @code{json} and @code{xml} package.")
+    (license license:expat)))
+
 (define-public go-github-com-djherbis-atime
   (package
     (name "go-github-com-djherbis-atime")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 903f2126c4..5f8a550b15 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages golang)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mail)
   #:use-module (gnu packages mp3)
@@ -3807,29 +3808,6 @@ (define-public go-golang-org-x-mod
 loading algorithms.")
       (license license:bsd-3))))
 
-(define-public go-github-com-burntsushi-toml
-  (package
-    (name "go-github-com-burntsushi-toml")
-    (version "1.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/BurntSushi/toml")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/BurntSushi/toml"))
-    (home-page "https://github.com/BurntSushi/toml")
-    (synopsis "Toml parser and encoder for Go")
-    (description
-     "This package is toml parser and encoder for Go.  The interface
-is similar to Go's standard library @code{json} and @code{xml} package.")
-    (license license:expat)))
-
 (define-public go-github-com-hashicorp-go-uuid
   (package
     (name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 00352dc327..48c5250c8c 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
   #:use-module (gnu packages check)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 29/30] gnu: go-github-com-andybalholm-brotli: Move to (gnu packages-compression).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:ee3d762fefd7c8e8777f850859cdcd0688f7a790.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-andybalholm-brotli): Move from here ...

* gnu/packages/golang-compression.scm: ... to here.

Change-Id: I820b0211b1fe4d90643e82fc32a99d8e8b6a9b0f

---

gnu/packages/golang-compression.scm | 27 +++++++++++++++++++++++++++

gnu/packages/golang.scm | 26 --------------------------

2 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (84 lines)diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 5aacc34a66..6a556daa25 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,32 @@ (define-module (gnu packages golang-compression)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-andybalholm-brotli
+  (package
+    (name "go-github-com-andybalholm-brotli")
+    (version "1.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/andybalholm/brotli")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/andybalholm/brotli"))
+    (home-page "https://github.com/andybalholm/brotli")
+    (synopsis "Pure Go Brotli encoder and decoder")
+    (description
+     "This package is a brotli compressor and decompressor implemented in Go.
+It was translated from the reference implementation
+(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
+the @code{c2go} tool at
+@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
+    (license license:expat)))
+
 (define-public go-github-com-golang-snappy
   (package
     (name "go-github-com-golang-snappy")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 24ca39fc58..644121a761 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3722,32 +3722,6 @@ (define-public go-github-com-google-cadvisor
 containers.")
       (license license:asl2.0))))
 
-(define-public go-github-com-andybalholm-brotli
-  (package
-    (name "go-github-com-andybalholm-brotli")
-    (version "1.0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/andybalholm/brotli")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/andybalholm/brotli"))
-    (home-page "https://github.com/andybalholm/brotli")
-    (synopsis "Pure Go Brotli encoder and decoder")
-    (description
-     "This package is a brotli compressor and decompressor implemented in Go.
-It was translated from the reference implementation
-(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
-the @code{c2go} tool at
-@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
-    (license license:expat)))
-
 (define-public go-github-com-jonboulle-clockwork
   (let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
         (revision "0"))
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 20/30] gnu: go-golang-org-x-sync: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:bd271425dc0c33b07109d348f1e4e3925674493d.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-sync): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: I28b72dc45116398512c0255ac9e06b9c539e9e7b

---

gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 30 ------------------------------

2 files changed, 30 insertions(+), 30 deletions(-)

Toggle diff (90 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 8e64571929..7b8653960d 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
@@ -168,6 +169,35 @@ (define-public go-golang-org-x-net-html
     (description
      "This package provides an HTML5-compliant tokenizer and parser.")))
 
+(define-public go-golang-org-x-sync
+  (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
+        (revision "1"))
+    (package
+      (name "go-golang-org-x-sync")
+      (version (git-version "0.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/sync")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
+      (build-system go-build-system)
+      (arguments
+       `(#:import-path "golang.org/x/sync"
+         #:tests? #f
+         ;; Source-only package
+         #:phases (modify-phases %standard-phases
+                    (delete 'build))))
+      (home-page "https://go.googlesource.com/sync/")
+      (synopsis "Additional Go concurrency primitives")
+      (description "This package provides Go concurrency primitives in
+addition to the ones provided by the language and “sync” and “sync/atomic”
+packages.")
+      (license license:bsd-3))))
+
 (define-public go-golang.org-x-sync-errgroup
   (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7e5626a303..8bfabb9da9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,36 +3559,6 @@ (define-public go-golang-org-x-image
 processing.")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-sync
-  (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
-        (revision "1"))
-    (package
-      (name "go-golang-org-x-sync")
-      (version (git-version "0.1.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/sync")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/sync"
-         #:tests? #f
-         ;; Source-only package
-         #:phases (modify-phases %standard-phases
-                    (delete 'build))))
-      (synopsis "Additional Go concurrency primitives")
-      (description
-       "This package provides Go concurrency primitives in addition
-to the ones provided by the language and “sync” and “sync/atomic”
-packages.")
-      (home-page "https://go.googlesource.com/sync/")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 22/30] gnu: go-golang-org-x-time: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:78108fa2c0ffa1422cee42541c276796e3f41b90.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-time): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/high-availability.scm: Add (gnu packages golang-build) module.

Change-Id: I2f2704501b19d991d153c6d8636e1f9fc4cf154b

---

gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 31 -------------------------------

2 files changed, 30 insertions(+), 31 deletions(-)

Toggle diff (85 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index db94ad2c7b..3885701078 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -292,6 +292,36 @@ (define-public go-golang-org-x-term
 terminals, as commonly found on Unix systems.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-time
+  (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
+        (revision "2"))
+    (package
+      (name "go-golang-org-x-time")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/time")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
+      (build-system go-build-system)
+      (arguments
+       `(#:import-path "golang.org/x/time"
+         ;; Source-only package
+         #:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+         ;; Source-only package
+           (delete 'build))))
+      (home-page "https://godoc.org/golang.org/x/time/rate")
+      (synopsis "Supplemental Go time libraries")
+      (description "This package provides supplemental Go libraries related to
+time.")
+      (license license:bsd-3))))
+
 (define-public go-golang-org-x-xerrors
   (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 240c87c3ba..6c056e19a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3587,37 +3587,6 @@ (define-public go-golang-org-x-text
     (home-page "https://go.googlesource.com/text")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-time
-  (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
-        (revision "2"))
-    (package
-      (name "go-golang-org-x-time")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/time")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/time"
-         ; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'build))))
-;      (propagated-inputs
-;       `(("go-golang-org-x-net" ,go-golang-org-x-net)))
-      (synopsis "Supplemental Go time libraries")
-      (description "This package provides supplemental Go libraries related to
-time.")
-      (home-page "https://godoc.org/golang.org/x/time/rate")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-oauth2
   (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
         (revision "1"))
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 01/30] gnu: Add (gnu packages golang-build) module.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:044357fe1249a03057b405cdc90aaf47d0778efc.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang-build.scm: New file.

* gnu/local.mk: Add to gnu/packages/golang-build.scm scope.

Change-Id: I4605d44452859b47ed6369a234c7ead496b19c2a

---

gnu/local.mk | 1 +

gnu/packages/golang-build.scm | 44 +++++++++++++++++++++++++++++++++++

2 files changed, 45 insertions(+)

create mode 100644 gnu/packages/golang-build.scm

Toggle diff (64 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index 7806771eea..e40be7fb46 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -307,6 +307,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/gnu-pw-mgr.scm			\
   %D%/packages/gobby.scm			\
   %D%/packages/golang.scm			\
+  %D%/packages/golang-build.scm		\
   %D%/packages/golang-check.scm		\
   %D%/packages/golang-crypto.scm	      	\
   %D%/packages/golang-web.scm	        	\
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
new file mode 100644
index 0000000000..03fcdede80
--- /dev/null
+++ b/gnu/packages/golang-build.scm
@@ -0,0 +1,44 @@
+;;; 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-build)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system go)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Modules (libraries) which are part of the Golang project but outside the
+;;; main Golang tree, see <https://pkg.go.dev/golang.org/x>
+;;;
+;;; Since they are bound to be relied on by many, their dependencies should be
+;;; kept minimal, and this module should not depend on other modules
+;;; containing Golang packages.
+;;;
+;;; 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

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 03/30] gnu: go-golang-org-x-net: Move to (gnu packages golang-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:0a4697b99150ac12d3d1000d1bb4f2829830b7f9.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-net,
go-golang-org-x-net-0.17, go-golang-org-x-net-html): Move from here ...
* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/configuration-management.scm: Add (gnu packages golang-build) module.
* gnu/packages/education.scm: As above ...
* gnu/packages/file-systems.scm: As above ...
* gnu/packages/golang-check.scm: As above ...
* gnu/packages/golang-crypto.scm: As above ...
* gnu/packages/golang-web.scm: As above ...
* gnu/packages/golang-xyz.scm: As above ...
* gnu/packages/golang.scm: As above ...
* gnu/packages/ipfs.scm: As above ...
* gnu/packages/messaging.scm: As above ...
* gnu/packages/networking.scm: As above ...
* gnu/packages/uucp.scm: As above ...
* gnu/packages/version-control.scm: As above ...

Change-Id: If009e62555ada293f17cf0f42fde82c21ef4615e
---
 gnu/packages/configuration-management.scm |  1 +
 gnu/packages/education.scm                |  1 +
 gnu/packages/file-systems.scm             |  1 +
 gnu/packages/golang-build.scm             | 64 +++++++++++++++++++++++
 gnu/packages/golang-check.scm             |  3 +-
 gnu/packages/golang-crypto.scm            |  1 +
 gnu/packages/golang-web.scm               |  1 +
 gnu/packages/golang-xyz.scm               |  1 +
 gnu/packages/golang.scm                   | 60 +--------------------
 gnu/packages/ipfs.scm                     |  1 +
 gnu/packages/messaging.scm                |  1 +
 gnu/packages/networking.scm               |  1 +
 gnu/packages/uucp.scm                     |  1 +
 gnu/packages/version-control.scm          |  1 +
 14 files changed, 78 insertions(+), 60 deletions(-)

Toggle diff (306 lines)diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 296f48dcd5..6632f429e2 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
   #:use-module (guix build-system go)
   #:use-module (guix git-download)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages textutils)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 7b72ed0349..0f4a251bcc 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 61db3086c8..af6d1ee871 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 03fcdede80..2601dec27a 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +40,67 @@ (define-module (gnu packages golang-build)
 ;;;
 ;;; Code:
 
+(define-public go-golang-org-x-net
+  (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-net")
+      (version (git-version "0.5.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/net")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:import-path "golang.org/x/net"
+        ;; Source-only package
+        #:tests? #f
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; Source-only package
+            (delete 'build))))
+      (home-page "https://go.googlesource.com/net")
+      (synopsis "Go supplemental networking libraries")
+      (description "This package provides supplemental Go networking libraries.")
+      (license license:bsd-3))))
+
+;; XXX: Not in use by any other packages, consider to remove or merge with
+;; go-golang-org-x-net.
+(define-public go-golang-org-x-net-0.17
+  (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
+        (revision "0"))
+    (package
+      (inherit go-golang-org-x-net)
+      (name "go-golang-org-x-net")
+      (version (git-version "0.17.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/net")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
+
+(define-public go-golang-org-x-net-html
+  (package
+    (inherit go-golang-org-x-net)
+    (name "go-golang-org-x-net-html")
+    (arguments
+     '(#:import-path "golang.org/x/net/html"
+       #:unpack-path "golang.org/x/net"))
+    (home-page "https://godoc.org/golang.org/x/net/html")
+    (synopsis "HTML5-compliant tokenizer and parser")
+    (description
+     "This package provides an HTML5-compliant tokenizer and parser.")))
+
 ;;;
 ;;; 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-check.scm b/gnu/packages/golang-check.scm
index 912444bc8e..2decd1f664 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -41,7 +41,8 @@ (define-module (gnu packages golang-check)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (gnu packages)
-  #:use-module (gnu packages golang))
+  #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index bf2fc11e17..39e7412558 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages golang-crypto)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check))
 
 ;;; Commentary:
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 719cb5dfeb..d7fb7dd366 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages golang-web)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-xyz)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 8823ae21c6..33aa43357f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages golang-xyz)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto))
 
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 163691a1e6..3997f4057d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -81,6 +81,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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
@@ -3650,65 +3651,6 @@ (define-public gopls
 editor.")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-net
-  (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-net")
-      (version (git-version "0.5.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/net")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
-      (build-system go-build-system)
-      (arguments
-       (list
-        #:import-path "golang.org/x/net"
-        ;; Source-only package
-        #:tests? #f
-        #:phases
-        #~(modify-phases %standard-phases
-            ;; Source-only package
-            (delete 'build))))
-      (synopsis "Go supplemental networking libraries")
-      (description "This package provides supplemental Go networking libraries.")
-      (home-page "https://go.googlesource.com/net")
-      (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-0.17
-  (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
-        (revision "0"))
-    (package
-      (inherit go-golang-org-x-net)
-      (name "go-golang-org-x-net")
-      (version (git-version "0.17.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/net")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
-
-(define-public go-golang-org-x-net-html
-  (package
-    (inherit go-golang-org-x-net)
-    (name "go-golang.org-x-net-html")
-    (arguments
-     '(#:import-path "golang.org/x/net/html"
-       #:unpack-path "golang.org/x/net"))
-    (synopsis "HTML5-compliant tokenizer and parser")
-    (description
-     "This package provides an HTML5-compliant tokenizer and parser.")
-    (home-page "https://godoc.org/golang.org/x/net/html")))
-
 (define-public go-golang-org-x-image
   (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
         (revision "1"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a1b9333066..ae514cd93b 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bb33be4872..98c1c9bf67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages messaging)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 8d358961a1..dc21b2fbd0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -125,6 +125,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 37dc27625a..8f1759556e 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -19,6 +19,7 @@
 
 (define-module (gnu packages uucp)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages texinfo)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..51754245d3 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -106,6 +106,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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 16/30] gnu: go-golang-org-x-exp: Move to (gnu packages golang-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:bedd2d99caba68c399582fbdd35251b7e746ca08.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-exp): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: I2253ac166a8830662360b14cec0fa301686dac22

---

gnu/packages/golang-build.scm | 27 +++++++++++++++++++++++++++

gnu/packages/golang.scm | 27 ---------------------------

2 files changed, 27 insertions(+), 27 deletions(-)

Toggle diff (85 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index eeab951f1e..ffedc946c2 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,6 +41,32 @@ (define-module (gnu packages golang-build)
 ;;;
 ;;; Code:
 
+(define-public go-golang-org-x-exp
+  (package
+    (name "go-golang-org-x-exp")
+    (version "0.0.0-20221004215720-b9f4876ce741")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/exp")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/exp"
+       ;; Source-only package
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (home-page "https://golang.org/x/exp")
+    (synopsis "Experimental and deprecated Go packages")
+    (description "This subrepository holds experimental and deprecated (in the
+@code{old} directory) packages.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-net
   (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4a8e9dbc78..dd0ac7e3e8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,33 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
-(define-public go-golang-org-x-exp
-  (package
-    (name "go-golang-org-x-exp")
-    (version "0.0.0-20221004215720-b9f4876ce741")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/exp")
-                    (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "golang.org/x/exp"
-       ;; Source-only package
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  (delete 'build))))
-    (home-page "https://golang.org/x/exp")
-    (synopsis "Experimental and deprecated Go packages")
-    (description
-     "This subrepository holds experimental and deprecated (in the @code{old}
-directory) packages.")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-tools
   (package
     (name "go-golang-org-x-tools")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 12/30] gnu: go-github-com-bmizerany-perks-quantile: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:8f3b931474ecd4f90cc481363bfb6da13309ee92.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-bmizerany-perks-quantile): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I215d8f1f2710bd21ad9a251e4cb029064a0968f6

---

gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

2 files changed, 24 insertions(+), 24 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 9d2b43b86c..741023c098 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -44,6 +44,30 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-bmizerany-perks-quantile
+  (package
+    (name "go-github-com-bmizerany-perks-quantile")
+    (version "0.0.0-20230307044200-03f9df79da1e")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bmizerany/perks")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:unpack-path "github.com/bmizerany/perks"
+           #:import-path "github.com/bmizerany/perks/quantile"))
+    (home-page "https://github.com/bmizerany/perks")
+    (synopsis "Library for computing quantiles")
+    (description
+     "Perks contains the Go package @code{quantile} that computes approximate
+quantiles over an unbounded data stream within low memory and CPU bounds.")
+    (license license:bsd-2)))
+
 (define-public go-github-com-burntsushi-toml
   (package
     (name "go-github-com-burntsushi-toml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5f8a550b15..60781f0172 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7923,30 +7923,6 @@ (define-public go-github-com-bmatcuk-doublestar
 matching and globbing with support for \"doublestar\" patterns.")
     (license license:expat)))
 
-(define-public go-github-com-bmizerany-perks-quantile
-  (package
-    (name "go-github-com-bmizerany-perks-quantile")
-    (version "0.0.0-20230307044200-03f9df79da1e")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/bmizerany/perks")
-                    (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:unpack-path "github.com/bmizerany/perks"
-           #:import-path "github.com/bmizerany/perks/quantile"))
-    (home-page "https://github.com/bmizerany/perks")
-    (synopsis "Library for computing quantiles")
-    (description
-     "Perks contains the Go package @code{quantile} that computes approximate
-quantiles over an unbounded data stream within low memory and CPU bounds.")
-    (license license:bsd-2)))
-
 (define-public go-github-com-dlclark-regexp2
   (package
     (name "go-github-com-dlclark-regexp2")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 02/30] gnu: Add (gnu packages golang-compression) module.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:c7ea487ba479317cad96e5d5f45003f6ba18196f.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang-compression.scm: New file.

* gnu/local.mk: Add to gnu/packages/golang-compression.scm scope.

Change-Id: I1c68a3f6f9b3d6a316cba560b7fc81e707376417

---

gnu/local.mk | 1 +

gnu/packages/golang-compression.scm | 37 +++++++++++++++++++++++++++++

2 files changed, 38 insertions(+)

create mode 100644 gnu/packages/golang-compression.scm

Toggle diff (57 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index e40be7fb46..bb62c87bb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -309,6 +309,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/golang.scm			\
   %D%/packages/golang-build.scm		\
   %D%/packages/golang-check.scm		\
+  %D%/packages/golang-compression.scm		\
   %D%/packages/golang-crypto.scm	      	\
   %D%/packages/golang-web.scm	        	\
   %D%/packages/golang-xyz.scm	        	\
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
new file mode 100644
index 0000000000..268cd16e30
--- /dev/null
+++ b/gnu/packages/golang-compression.scm
@@ -0,0 +1,37 @@
+;;; 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-compression)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system go)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; 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

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 25/30] gnu: go-golang-org-x-tools: Move to (gnu packages-build).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:21fae942369cff919f73bd0611d16a27e3608416.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-tools): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: Ib9a69a5dab73b6f9d935fd0216658f5e4f8cf1f8

---

gnu/packages/golang-build.scm | 39 +++++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 41 -----------------------------------

2 files changed, 39 insertions(+), 41 deletions(-)

Toggle diff (104 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b2b2872907..87f184fb14 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -373,6 +373,45 @@ (define-public go-golang-org-x-time
 time.")
       (license license:bsd-3))))
 
+(define-public go-golang-org-x-tools
+  (package
+    (name "go-golang-org-x-tools")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/tools")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; gopls versions are tagged separately, and it is a
+           ;; separate Guix package.
+           (delete-file-recursively "gopls")))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "golang.org/x/tools"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; Source-only package
+         (delete 'build))))
+    (propagated-inputs
+     (list go-github-com-yuin-goldmark
+           go-golang-org-x-mod
+           go-golang-org-x-net
+           go-golang-org-x-sys))
+    (home-page "https://go.googlesource.com/tools/")
+    (synopsis "Tools that support the Go programming language")
+    (description "This package provides miscellaneous tools that support the
+Go programming language.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-xerrors
   (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 22a76daef4..4c2781bf45 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,47 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
-(define-public go-golang-org-x-tools
-  (package
-    (name "go-golang-org-x-tools")
-    (version "0.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://go.googlesource.com/tools")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; gopls versions are tagged separately, and it is a
-           ;; separate Guix package.
-           (delete-file-recursively "gopls")))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "golang.org/x/tools"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
-    (propagated-inputs
-     (list
-      go-github-com-yuin-goldmark
-      go-golang-org-x-mod
-      go-golang-org-x-net
-      go-golang-org-x-sys))
-    (synopsis "Tools that support the Go programming language")
-    (description "This package provides miscellaneous tools that support the
-Go programming language.")
-    (home-page "https://go.googlesource.com/tools/")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-crypto
   (package
     (name "go-golang-org-x-crypto")
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:53 +0100

[PATCH 13/30] gnu: go-github-com-blang-semver: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:2d5800e356c7c2b3abed8c001a5d0fdd4163460a.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-blang-semver): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/education.scm: Add (gnu packages golang-xyz) module.

* gnu/packages/ipfs.scm: As above.

Change-Id: I620543088661512bcc8135922a454c5f2dc73119

---

gnu/packages/education.scm | 1 +

gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

gnu/packages/ipfs.scm | 1 +

4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (104 lines)diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0f4a251bcc..c3009537e9 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages education)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 741023c098..292ff10a47 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,6 +1,7 @@
 ;;; 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 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -44,6 +45,30 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-blang-semver
+  (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
+        (revision "0"))
+    (package
+      (name "go-github-com-blang-semver")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/blang/semver")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/blang/semver"))
+      (home-page "https://github.com/blang/semver")
+      (synopsis "Semantic versioning library written in Go")
+      (description
+       "Semver is a library for Semantic versioning written in Go.")
+      (license license:expat))))
+
 (define-public go-github-com-bmizerany-perks-quantile
   (package
     (name "go-github-com-bmizerany-perks-quantile")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 60781f0172..41adf51bfb 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4020,30 +4020,6 @@ (define-public go-github-com-tomnomnom-gron
 absolute \"path\" to it.")
     (license license:expat)))
 
-(define-public go-github-com-blang-semver
-  (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
-        (revision "0"))
-    (package
-      (name "go-github-com-blang-semver")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/blang/semver")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/blang/semver"))
-      (home-page "https://github.com/blang/semver")
-      (synopsis "Semantic versioning library written in Go")
-      (description "Semver is a library for Semantic versioning written in Go.")
-      (license license:expat))))
-
 (define-public go-github-com-google-cadvisor
   (let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
         (revision "0"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index f09d0190dd..830e2ccd32 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages ipfs)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages python)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages syncthing))
-- 
2.41.0

Sharlatan Hellseher wrote on 11 Feb 11:52 +0100

[PATCH 05/30] gnu: go-github-com-mreiferson-go-options: Move to (gnu packages golang-xyz).

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:02746bdfee9eef09080d18859d95c4ac6ed64499.1707646257.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-mreiferson-go-options): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Ia5cf19a48812b56b0b38ed80246a65c345454c79

---

gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++

gnu/packages/golang.scm | 23 -----------------------

2 files changed, 24 insertions(+), 23 deletions(-)

Toggle diff (77 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 33aa43357f..ebcf333b13 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
@@ -146,6 +147,29 @@ (define-public go-github-com-matryer-try
     (description "This package provides an idiomatic Go retry module.")
     (license license:expat)))
 
+(define-public go-github-com-mreiferson-go-options
+  (package
+    (name "go-github-com-mreiferson-go-options")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mreiferson/go-options")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/mreiferson/go-options"))
+    (home-page "https://github.com/mreiferson/go-options")
+    (synopsis "Go package to structure and resolve options")
+    (description
+     "The @code{options} Go package resolves configuration values set via
+command line flags, config files, and default struct values.")
+    (license license:expat)))
+
 (define-public go-github-com-nats-io-nats-go
   (package
     (name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 43e9024167..73e7077eac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5515,29 +5515,6 @@ (define-public go-github-com-mr-tron-base58
 encoding and 8 times faster decoding.")
       (license license:expat))))
 
-(define-public go-github-com-mreiferson-go-options
-  (package
-    (name "go-github-com-mreiferson-go-options")
-    (version "1.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/mreiferson/go-options")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/mreiferson/go-options"))
-    (home-page "https://github.com/mreiferson/go-options")
-    (synopsis "Go package to structure and resolve options")
-    (description
-     "The @code{options} Go package resolves configuration values set via
-command line flags, config files, and default struct values.")
-    (license license:expat)))
-
 (define-public go-github-com-mreiferson-go-svc
   ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
   ;; does not support go.mod with `replace' statement.
-- 
2.41.0

Liliana Marie Prikler wrote on 12 Feb 14:57 +0100

Re: [bug#69042] [PATCH 26/30] gnu: go-golang-org-x-image: Move to (gnu packages-build).

Recipients:

Message-ID:86c2157c4497b5d24c02366ca673c4dc6ca4d67e.camel@gmail.com

Am Sonntag, dem 11.02.2024 um 10:53 +0000 schrieb Sharlatan Hellseher:

Toggle quote (6 lines)> * gnu/packages/golang.scm (go-golang-org-x-image): Move from here ...
> * gnu/packages/golang-build.scm: ... to here.
> 
> * gnu/packages/game.scm: Add (gnu packages golang-build) module.
> 
> Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede

The commit message itself looks borked. It ought to be "Move to (gnu

packages golang-build)" or – if you want to shorten it "Move to golang-

build".

Cheers

Sharlatan Hellseher wrote on 12 Feb 16:08 +0100

[PATCH 00/30] Split (gnu packages golang) part IV.

Recipients:(address . 69042@debbugs.gnu.org)(address . liliana.prikler@gmail.com)

Message-ID:CAO+9K5oiUhrVk2t0Kv6TS0kCE-9rmuEzzsksoJuk=KwBBn64bg@mail.gmail.com

Hi,

Great, I see it. It might be a bad macro I've used.

I will prepare v2 tonight.

Thanks,

Oleg

Attachment: file

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 04/30] gnu: go-github-com-golang-snappy: Mmove to golang-compression.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e96cfe4b8fbfcd5f6b88a911e2ea4a27737c7b49.1707763691.git.sharlatanus@gmail.com

* gnu/packages/syncthing.scm (go-github-com-golang-snappy): Move from
here ...
* gnu/packages/golang-compression.scm: ... to here.

* gnu/packages/golang.scm: Add (gnu packages golang-compression) module.
* gnu/packages/high-availability.scm: As above.
* gnu/packages/ipfs.scm: As above.
* gnu/packages/syncthing.scm: As above.

Change-Id: I936c82c127e1aa25dde20693bee70e5a871249fe
---
 gnu/packages/golang-compression.scm | 26 ++++++++++++++++++++++++++
 gnu/packages/golang.scm             |  1 +
 gnu/packages/high-availability.scm  |  4 ++--
 gnu/packages/ipfs.scm               |  1 +
 gnu/packages/syncthing.scm          | 24 +-----------------------
 5 files changed, 31 insertions(+), 25 deletions(-)

Toggle diff (139 lines)diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 268cd16e30..670572ea90 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,4 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,6 +33,29 @@ (define-module (gnu packages golang-compression)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-golang-snappy
+  (package
+    (name "go-github-com-golang-snappy")
+    (version "0.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/snappy")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
+       (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/golang/snappy"))
+    (home-page "https://github.com/golang/snappy")
+    (synopsis "Snappy compression format in the Go programming language")
+    (description "This package provides a Go implementation of the Snappy
+compression format.")
+    (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 3997f4057d..43e9024167 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -83,6 +83,7 @@ (define-module (gnu packages golang)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages lua)
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 9760084603..ad18a39738 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
@@ -48,7 +49,6 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages rsync)
-  #:use-module (gnu packages syncthing)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages version-control)
@@ -284,7 +284,7 @@ (define-public nsq
            go-github-com-bmizerany-perks-quantile
            go-github-com-burntsushi-toml
            go-github-com-davecgh-go-spew
-           go-github-com-golang-snappy ; Move to (gnu packages golang)
+           go-github-com-golang-snappy
            go-github-com-julienschmidt-httprouter
            go-github-com-mreiferson-go-options
            go-github-com-mreiferson-go-svc
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index ae514cd93b..f09d0190dd 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages ipfs)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages python)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4c3aa8f30b..c0270b87e5 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages python-crypto)
@@ -398,29 +399,6 @@ (define-public go-github-com-golang-groupcache-lru
       (home-page "https://github.com/golang/groupcache")
       (license asl2.0))))
 
-(define-public go-github-com-golang-snappy
-  (package
-    (name "go-github-com-golang-snappy")
-    (version "0.0.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/golang/snappy")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"))
-              (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/golang/snappy"))
-    (synopsis "Snappy compression format in the Go programming language")
-    (description "This package provides a Go implementation of the Snappy
-compression format.")
-    (home-page "https://github.com/golang/snappy")
-    (license bsd-3)))
-
 (define-public go-github-com-jackpal-gateway
   (package
     (name "go-github-com-jackpal-gateway")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 03/30] gnu: go-golang-org-x-net: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:cd328aa3f6ea3c9e5b58a140d506d2b9ee1387f1.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-net,
go-golang-org-x-net-0.17, go-golang-org-x-net-html): Move from here ...
* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/configuration-management.scm: Add (gnu packages golang-build) module.
* gnu/packages/education.scm: As above ...
* gnu/packages/file-systems.scm: As above ...
* gnu/packages/golang-check.scm: As above ...
* gnu/packages/golang-crypto.scm: As above ...
* gnu/packages/golang-web.scm: As above ...
* gnu/packages/golang-xyz.scm: As above ...
* gnu/packages/golang.scm: As above ...
* gnu/packages/ipfs.scm: As above ...
* gnu/packages/messaging.scm: As above ...
* gnu/packages/networking.scm: As above ...
* gnu/packages/uucp.scm: As above ...
* gnu/packages/version-control.scm: As above ...

Change-Id: If009e62555ada293f17cf0f42fde82c21ef4615e
---
 gnu/packages/configuration-management.scm |  1 +
 gnu/packages/education.scm                |  1 +
 gnu/packages/file-systems.scm             |  1 +
 gnu/packages/golang-build.scm             | 64 +++++++++++++++++++++++
 gnu/packages/golang-check.scm             |  3 +-
 gnu/packages/golang-crypto.scm            |  1 +
 gnu/packages/golang-web.scm               |  1 +
 gnu/packages/golang-xyz.scm               |  1 +
 gnu/packages/golang.scm                   | 60 +--------------------
 gnu/packages/ipfs.scm                     |  1 +
 gnu/packages/messaging.scm                |  1 +
 gnu/packages/networking.scm               |  1 +
 gnu/packages/uucp.scm                     |  1 +
 gnu/packages/version-control.scm          |  1 +
 14 files changed, 78 insertions(+), 60 deletions(-)

Toggle diff (306 lines)diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 296f48dcd5..6632f429e2 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
   #:use-module (guix build-system go)
   #:use-module (guix git-download)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages textutils)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 7b72ed0349..0f4a251bcc 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 61db3086c8..af6d1ee871 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 03fcdede80..2601dec27a 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +40,67 @@ (define-module (gnu packages golang-build)
 ;;;
 ;;; Code:
 
+(define-public go-golang-org-x-net
+  (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-net")
+      (version (git-version "0.5.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/net")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:import-path "golang.org/x/net"
+        ;; Source-only package
+        #:tests? #f
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; Source-only package
+            (delete 'build))))
+      (home-page "https://go.googlesource.com/net")
+      (synopsis "Go supplemental networking libraries")
+      (description "This package provides supplemental Go networking libraries.")
+      (license license:bsd-3))))
+
+;; XXX: Not in use by any other packages, consider to remove or merge with
+;; go-golang-org-x-net.
+(define-public go-golang-org-x-net-0.17
+  (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
+        (revision "0"))
+    (package
+      (inherit go-golang-org-x-net)
+      (name "go-golang-org-x-net")
+      (version (git-version "0.17.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/net")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
+
+(define-public go-golang-org-x-net-html
+  (package
+    (inherit go-golang-org-x-net)
+    (name "go-golang-org-x-net-html")
+    (arguments
+     '(#:import-path "golang.org/x/net/html"
+       #:unpack-path "golang.org/x/net"))
+    (home-page "https://godoc.org/golang.org/x/net/html")
+    (synopsis "HTML5-compliant tokenizer and parser")
+    (description
+     "This package provides an HTML5-compliant tokenizer and parser.")))
+
 ;;;
 ;;; 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-check.scm b/gnu/packages/golang-check.scm
index 912444bc8e..2decd1f664 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -41,7 +41,8 @@ (define-module (gnu packages golang-check)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (gnu packages)
-  #:use-module (gnu packages golang))
+  #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index bf2fc11e17..39e7412558 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages golang-crypto)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check))
 
 ;;; Commentary:
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 719cb5dfeb..d7fb7dd366 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages golang-web)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-xyz)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 8823ae21c6..33aa43357f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages golang-xyz)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto))
 
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 163691a1e6..3997f4057d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -81,6 +81,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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
@@ -3650,65 +3651,6 @@ (define-public gopls
 editor.")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-net
-  (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-net")
-      (version (git-version "0.5.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/net")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
-      (build-system go-build-system)
-      (arguments
-       (list
-        #:import-path "golang.org/x/net"
-        ;; Source-only package
-        #:tests? #f
-        #:phases
-        #~(modify-phases %standard-phases
-            ;; Source-only package
-            (delete 'build))))
-      (synopsis "Go supplemental networking libraries")
-      (description "This package provides supplemental Go networking libraries.")
-      (home-page "https://go.googlesource.com/net")
-      (license license:bsd-3))))
-
-(define-public go-golang-org-x-net-0.17
-  (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
-        (revision "0"))
-    (package
-      (inherit go-golang-org-x-net)
-      (name "go-golang-org-x-net")
-      (version (git-version "0.17.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/net")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
-
-(define-public go-golang-org-x-net-html
-  (package
-    (inherit go-golang-org-x-net)
-    (name "go-golang.org-x-net-html")
-    (arguments
-     '(#:import-path "golang.org/x/net/html"
-       #:unpack-path "golang.org/x/net"))
-    (synopsis "HTML5-compliant tokenizer and parser")
-    (description
-     "This package provides an HTML5-compliant tokenizer and parser.")
-    (home-page "https://godoc.org/golang.org/x/net/html")))
-
 (define-public go-golang-org-x-image
   (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
         (revision "1"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a1b9333066..ae514cd93b 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bb33be4872..98c1c9bf67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages messaging)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 8d358961a1..dc21b2fbd0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -125,6 +125,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 37dc27625a..8f1759556e 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -19,6 +19,7 @@
 
 (define-module (gnu packages uucp)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages texinfo)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..51754245d3 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -106,6 +106,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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 08/30] gnu: go-github-com-nsqio-go-nsq: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:13e2a311bc574be340361f892c9d5a1b0a88af1a.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-nsqio-go-nsq): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Ie718c9943dd527281b30c78ab4e23adc764289c1

---

gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++

gnu/packages/golang.scm | 26 --------------------------

2 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (84 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index aefe0e0d9c..bbf72f1105 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages golang-xyz)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto))
 
 ;;; Commentary:
@@ -249,6 +250,32 @@ (define-public go-github-com-nats-io-nuid
 very fast, and tries to be entropy pool friendly.")
     (license license:asl2.0)))
 
+(define-public go-github-com-nsqio-go-nsq
+  (package
+    (name "go-github-com-nsqio-go-nsq")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nsqio/go-nsq")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:tests? #f                  ;tests require networking
+           #:import-path "github.com/nsqio/go-nsq"))
+    (propagated-inputs (list go-github-com-golang-snappy))
+    (home-page "https://github.com/nsqio/go-nsq")
+    (synopsis "Consumer/producer library for NSQ")
+    (description
+     "The @code{nsq} Go module provides a high-level @code{Consumer} and
+@code{Producer} types as well as low-level functions to communicate over the
+NSQ protocol @url{https://nsq.io/}.")
+    (license license:expat)))
+
 (define-public go-go-uber-org-automaxprocs
   (package
     (name "go-go-uber-org-automaxprocs")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5887d68630..b8b5a67613 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3098,32 +3098,6 @@ (define-public go-github-com-nsqio-go-diskqueue
 queue.")
     (license license:expat)))
 
-(define-public go-github-com-nsqio-go-nsq
-  (package
-    (name "go-github-com-nsqio-go-nsq")
-    (version "1.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/nsqio/go-nsq")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1h9z3z225sdgg7fl3l7x11xn5ch6lm5flgmcj046cdp453qj2qhf"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:tests? #f                  ;tests require networking
-           #:import-path "github.com/nsqio/go-nsq"))
-    (propagated-inputs (list go-github-com-golang-snappy))
-    (home-page "https://github.com/nsqio/go-nsq")
-    (synopsis "Consumer/producer library for NSQ")
-    (description
-     "The @code{nsq} Go module provides a high-level @code{Consumer} and
-@code{Producer} types as well as low-level functions to communicate over the
-NSQ protocol @url{https://nsq.io/}.")
-    (license license:expat)))
-
 (define-public go-github-com-hebcal-gematriya
   (let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
         (revision "0"))
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 13/30] gnu: go-github-com-blang-semver: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:d91d134d9808c4aaa0f25986585a579ed50ccd79.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-blang-semver): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/education.scm: Add (gnu packages golang-xyz) module.

* gnu/packages/ipfs.scm: As above.

Change-Id: I620543088661512bcc8135922a454c5f2dc73119

---

gnu/packages/education.scm | 1 +

gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

gnu/packages/ipfs.scm | 1 +

4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (104 lines)diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0f4a251bcc..c3009537e9 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages education)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 741023c098..292ff10a47 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,6 +1,7 @@
 ;;; 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 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -44,6 +45,30 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-blang-semver
+  (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
+        (revision "0"))
+    (package
+      (name "go-github-com-blang-semver")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/blang/semver")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/blang/semver"))
+      (home-page "https://github.com/blang/semver")
+      (synopsis "Semantic versioning library written in Go")
+      (description
+       "Semver is a library for Semantic versioning written in Go.")
+      (license license:expat))))
+
 (define-public go-github-com-bmizerany-perks-quantile
   (package
     (name "go-github-com-bmizerany-perks-quantile")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 60781f0172..41adf51bfb 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4020,30 +4020,6 @@ (define-public go-github-com-tomnomnom-gron
 absolute \"path\" to it.")
     (license license:expat)))
 
-(define-public go-github-com-blang-semver
-  (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
-        (revision "0"))
-    (package
-      (name "go-github-com-blang-semver")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/blang/semver")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/blang/semver"))
-      (home-page "https://github.com/blang/semver")
-      (synopsis "Semantic versioning library written in Go")
-      (description "Semver is a library for Semantic versioning written in Go.")
-      (license license:expat))))
-
 (define-public go-github-com-google-cadvisor
   (let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
         (revision "0"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index f09d0190dd..830e2ccd32 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages ipfs)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages python)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages syncthing))
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 12/30] gnu: go-github-com-bmizerany-perks-quantile: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:43d5ba15b0e2aac821ebf5bac374559ae0c8e486.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-bmizerany-perks-quantile): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I215d8f1f2710bd21ad9a251e4cb029064a0968f6

---

gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

2 files changed, 24 insertions(+), 24 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 9d2b43b86c..741023c098 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -44,6 +44,30 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-bmizerany-perks-quantile
+  (package
+    (name "go-github-com-bmizerany-perks-quantile")
+    (version "0.0.0-20230307044200-03f9df79da1e")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bmizerany/perks")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:unpack-path "github.com/bmizerany/perks"
+           #:import-path "github.com/bmizerany/perks/quantile"))
+    (home-page "https://github.com/bmizerany/perks")
+    (synopsis "Library for computing quantiles")
+    (description
+     "Perks contains the Go package @code{quantile} that computes approximate
+quantiles over an unbounded data stream within low memory and CPU bounds.")
+    (license license:bsd-2)))
+
 (define-public go-github-com-burntsushi-toml
   (package
     (name "go-github-com-burntsushi-toml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5f8a550b15..60781f0172 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7923,30 +7923,6 @@ (define-public go-github-com-bmatcuk-doublestar
 matching and globbing with support for \"doublestar\" patterns.")
     (license license:expat)))
 
-(define-public go-github-com-bmizerany-perks-quantile
-  (package
-    (name "go-github-com-bmizerany-perks-quantile")
-    (version "0.0.0-20230307044200-03f9df79da1e")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/bmizerany/perks")
-                    (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1f2a99v3618bz2mf61iwhdjm3xi1gam6v4apqgcrz71gj7ba9943"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:unpack-path "github.com/bmizerany/perks"
-           #:import-path "github.com/bmizerany/perks/quantile"))
-    (home-page "https://github.com/bmizerany/perks")
-    (synopsis "Library for computing quantiles")
-    (description
-     "Perks contains the Go package @code{quantile} that computes approximate
-quantiles over an unbounded data stream within low memory and CPU bounds.")
-    (license license:bsd-2)))
-
 (define-public go-github-com-dlclark-regexp2
   (package
     (name "go-github-com-dlclark-regexp2")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 09/30] gnu: go-github-com-nsqio-go-diskqueue: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:36d525329c2d7e6e991f805e63d6b8cc8d207f6b.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-nsqio-go-diskqueue): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I2051eb1f8a40eeab9c8cc96c540413f5818dd78e

---

gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++

gnu/packages/golang.scm | 23 -----------------------

2 files changed, 23 insertions(+), 23 deletions(-)

Toggle diff (70 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index bbf72f1105..1999aab7fb 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -250,6 +250,29 @@ (define-public go-github-com-nats-io-nuid
 very fast, and tries to be entropy pool friendly.")
     (license license:asl2.0)))
 
+(define-public go-github-com-nsqio-go-diskqueue
+  (package
+    (name "go-github-com-nsqio-go-diskqueue")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nsqio/go-diskqueue")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/nsqio/go-diskqueue"))
+    (home-page "https://github.com/nsqio/go-diskqueue")
+    (synopsis "Go package providing a file system backed FIFO queue")
+    (description
+     "The @code{diskqueue} Go package provides a file system backed FIFO
+queue.")
+    (license license:expat)))
+
 (define-public go-github-com-nsqio-go-nsq
   (package
     (name "go-github-com-nsqio-go-nsq")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b8b5a67613..599fdf9f2d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3075,29 +3075,6 @@ (define-public go-github-com-nathan-osman-go-sunrise
 sunset times from geographical coordinates and a date.")
       (license license:expat))))
 
-(define-public go-github-com-nsqio-go-diskqueue
-  (package
-    (name "go-github-com-nsqio-go-diskqueue")
-    (version "1.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/nsqio/go-diskqueue")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1hp66hkmfn0nyf3c53a40f94ah11a9rj01r5zp3jph9p54j8rany"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/nsqio/go-diskqueue"))
-    (home-page "https://github.com/nsqio/go-diskqueue")
-    (synopsis "Go package providing a file system backed FIFO queue")
-    (description
-     "The @code{diskqueue} Go package provides a file system backed FIFO
-queue.")
-    (license license:expat)))
-
 (define-public go-github-com-hebcal-gematriya
   (let ((commit "fe3043f73e415eb82727701d10f2fb40f87675e9")
         (revision "0"))
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 14/30] gnu: go-github-com-bitly-timer-metrics: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:5aa79b1ba2e0e4d9a49d93d36d294881b82758f2.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-bitly-timer-metrics): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Id30d1add9ccbfbc05af114f6ccf82f353a7aa74b

---

gnu/packages/golang-xyz.scm | 22 ++++++++++++++++++++++

gnu/packages/golang.scm | 23 -----------------------

2 files changed, 22 insertions(+), 23 deletions(-)

Toggle diff (69 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 292ff10a47..a396057da9 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,28 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-bitly-timer-metrics
+  (package
+    (name "go-github-com-bitly-timer-metrics")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bitly/timer_metrics")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/bitly/timer_metrics"))
+    (home-page "https://github.com/bitly/timer_metrics")
+    (synopsis "Capture timings and enable periodic metrics every @var{n} events")
+    (description "This package provides an efficient way to capture timing
+information and periodically output metrics")
+    (license license:expat)))
+
 (define-public go-github-com-blang-semver
   (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41adf51bfb..d594759bdf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1906,29 +1906,6 @@ (define-public go-github-com-bitly-go-hostpool
 robin or epsilon greedy mode, and unresponsive hosts are avoided.")
     (license license:expat)))
 
-(define-public go-github-com-bitly-timer-metrics
-  (package
-    (name "go-github-com-bitly-timer-metrics")
-    (version "1.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/bitly/timer_metrics")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "02fhx8hx8126m2cgxw9fm8q2401r7zfann8b5zy5yyark1sgkrb4"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/bitly/timer_metrics"))
-    (home-page "https://github.com/bitly/timer_metrics")
-    (synopsis "Capture timings and enable periodic metrics every @var{n} events")
-    (description
-     "This package provides an efficient way to capture timing information and
-periodically output metrics")
-    (license license:expat)))
-
 (define-public go-github-com-blanu-dust
   (package
     (name "go-github-com-blanu-dust")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 16/30] gnu: go-golang-org-x-exp: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:0d256b71898c6e458fd2a6c98f977bfac485fd6f.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-exp): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: I2253ac166a8830662360b14cec0fa301686dac22

---

gnu/packages/golang-build.scm | 27 +++++++++++++++++++++++++++

gnu/packages/golang.scm | 27 ---------------------------

2 files changed, 27 insertions(+), 27 deletions(-)

Toggle diff (85 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index eeab951f1e..ffedc946c2 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,6 +41,32 @@ (define-module (gnu packages golang-build)
 ;;;
 ;;; Code:
 
+(define-public go-golang-org-x-exp
+  (package
+    (name "go-golang-org-x-exp")
+    (version "0.0.0-20221004215720-b9f4876ce741")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/exp")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/exp"
+       ;; Source-only package
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (home-page "https://golang.org/x/exp")
+    (synopsis "Experimental and deprecated Go packages")
+    (description "This subrepository holds experimental and deprecated (in the
+@code{old} directory) packages.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-net
   (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4a8e9dbc78..dd0ac7e3e8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,33 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
-(define-public go-golang-org-x-exp
-  (package
-    (name "go-golang-org-x-exp")
-    (version "0.0.0-20221004215720-b9f4876ce741")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/exp")
-                    (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "golang.org/x/exp"
-       ;; Source-only package
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  (delete 'build))))
-    (home-page "https://golang.org/x/exp")
-    (synopsis "Experimental and deprecated Go packages")
-    (description
-     "This subrepository holds experimental and deprecated (in the @code{old}
-directory) packages.")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-tools
   (package
     (name "go-golang-org-x-tools")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 17/30] gnu: go-golang-org-x-mod: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:8db31dfc0651e3ba693ac007ce2e2c90708519ff.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-mod): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/shellutils.scm: Add (gnu packages golang-build) module.

Change-Id: I88ce7ac1e264cb545a272f9c8a485747e84f7c82

---

gnu/packages/golang-build.scm | 36 +++++++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 34 ---------------------------------

gnu/packages/shellutils.scm | 1 +

3 files changed, 37 insertions(+), 34 deletions(-)

Toggle diff (112 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index ffedc946c2..a8e97e7acb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
@@ -67,6 +69,40 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-mod
+  (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-mod")
+      (version (git-version "0.7.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/golang/mod")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "golang.org/x/mod/"
+         #:tests? #f
+         #:phases (modify-phases %standard-phases
+                    ;; Source-only package
+                    (delete 'build))))
+      (home-page "https://golang.org/x/mod")
+      (synopsis "Tools to work directly with Go module mechanics")
+      (description
+       "This repository holds packages for writing tools that work directly
+with Go module mechanics.  That is, it is for direct manipulation of Go
+modules themselves.
+
+The specific case of loading packages should still be done by invoking the
+@command{go} command, which remains the single point of truth for package
+loading algorithms.")
+      (license license:bsd-3))))
+
 (define-public go-golang-org-x-net
   (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index dd0ac7e3e8..e7b98028a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3699,40 +3699,6 @@ (define-public go-golang-org-x-xerrors
       (home-page "https://godoc.org/golang.org/x/xerrors")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-mod
-  (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-mod")
-      (version (git-version "0.7.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/golang/mod")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/mod/"
-         #:tests? #f
-         #:phases (modify-phases %standard-phases
-                    ;; Source-only package
-                    (delete 'build))))
-      (home-page "https://golang.org/x/mod")
-      (synopsis "Tools to work directly with Go module mechanics")
-      (description
-       "This repository holds packages for writing tools that work directly
-with Go module mechanics.  That is, it is for direct manipulation of Go modules
-themselves.
-
-The specific case of loading packages should still be done by invoking the
-@command{go} command, which remains the single point of truth for package
-loading algorithms.")
-      (license license:bsd-3))))
-
 (define-public go-github-com-hashicorp-go-uuid
   (package
     (name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 48c5250c8c..e58e9e61fc 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
   #:use-module (gnu packages check)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages ncurses)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 18/30] gnu: go-golang-org-x-xerrors: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:80244dd136e304afabcbfc628d0917a67f1e7804.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-xerrors): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: I68c9aa1607d71d08eb7ea4e5caf27121cdd0df4c

---

gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

2 files changed, 25 insertions(+), 24 deletions(-)

Toggle diff (79 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index a8e97e7acb..fed606e8fb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -195,6 +196,30 @@ (define-public go-golang-org-x-sys
 support for low-level interaction with the operating system.")
       (license license:bsd-3))))
 
+(define-public go-golang-org-x-xerrors
+  (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-xerrors")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/xerrors")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "golang.org/x/xerrors"))
+      (home-page "https://godoc.org/golang.org/x/xerrors")
+      (synopsis "Go 1.13 error values")
+      (description "This package holds the transition packages for the new Go
+1.13 error values.")
+      (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 e7b98028a5..68b905ff8b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3675,30 +3675,6 @@ (define-public go-golang-org-x-oauth2
  spec in Go.")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-xerrors
-  (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-xerrors")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/xerrors")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/xerrors"))
-      (synopsis "Go 1.13 error values")
-      (description
-       "This package holds the transition packages for the new Go 1.13 error values.")
-      (home-page "https://godoc.org/golang.org/x/xerrors")
-      (license license:bsd-3))))
-
 (define-public go-github-com-hashicorp-go-uuid
   (package
     (name "go-github-com-hashicorp-go-uuid")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 20/30] gnu: go-golang-org-x-sync: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:1b3d7234233de3b88290f100bfaf81c148b3c6ea.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-sync): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: I28b72dc45116398512c0255ac9e06b9c539e9e7b

---

gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 30 ------------------------------

2 files changed, 30 insertions(+), 30 deletions(-)

Toggle diff (90 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 8e64571929..7b8653960d 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
@@ -168,6 +169,35 @@ (define-public go-golang-org-x-net-html
     (description
      "This package provides an HTML5-compliant tokenizer and parser.")))
 
+(define-public go-golang-org-x-sync
+  (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
+        (revision "1"))
+    (package
+      (name "go-golang-org-x-sync")
+      (version (git-version "0.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/sync")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
+      (build-system go-build-system)
+      (arguments
+       `(#:import-path "golang.org/x/sync"
+         #:tests? #f
+         ;; Source-only package
+         #:phases (modify-phases %standard-phases
+                    (delete 'build))))
+      (home-page "https://go.googlesource.com/sync/")
+      (synopsis "Additional Go concurrency primitives")
+      (description "This package provides Go concurrency primitives in
+addition to the ones provided by the language and “sync” and “sync/atomic”
+packages.")
+      (license license:bsd-3))))
+
 (define-public go-golang.org-x-sync-errgroup
   (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7e5626a303..8bfabb9da9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,36 +3559,6 @@ (define-public go-golang-org-x-image
 processing.")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-sync
-  (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
-        (revision "1"))
-    (package
-      (name "go-golang-org-x-sync")
-      (version (git-version "0.1.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/sync")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/sync"
-         #:tests? #f
-         ;; Source-only package
-         #:phases (modify-phases %standard-phases
-                    (delete 'build))))
-      (synopsis "Additional Go concurrency primitives")
-      (description
-       "This package provides Go concurrency primitives in addition
-to the ones provided by the language and “sync” and “sync/atomic”
-packages.")
-      (home-page "https://go.googlesource.com/sync/")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 22/30] gnu: go-golang-org-x-time: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:4086c330052872f3d55491747e62f9e9e3dc794f.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-time): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/high-availability.scm: Add (gnu packages golang-build) module.

Change-Id: I2f2704501b19d991d153c6d8636e1f9fc4cf154b

---

gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 31 -------------------------------

2 files changed, 30 insertions(+), 31 deletions(-)

Toggle diff (85 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index db94ad2c7b..3885701078 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -292,6 +292,36 @@ (define-public go-golang-org-x-term
 terminals, as commonly found on Unix systems.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-time
+  (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
+        (revision "2"))
+    (package
+      (name "go-golang-org-x-time")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/time")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
+      (build-system go-build-system)
+      (arguments
+       `(#:import-path "golang.org/x/time"
+         ;; Source-only package
+         #:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+         ;; Source-only package
+           (delete 'build))))
+      (home-page "https://godoc.org/golang.org/x/time/rate")
+      (synopsis "Supplemental Go time libraries")
+      (description "This package provides supplemental Go libraries related to
+time.")
+      (license license:bsd-3))))
+
 (define-public go-golang-org-x-xerrors
   (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 240c87c3ba..6c056e19a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3587,37 +3587,6 @@ (define-public go-golang-org-x-text
     (home-page "https://go.googlesource.com/text")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-time
-  (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
-        (revision "2"))
-    (package
-      (name "go-golang-org-x-time")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/time")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/time"
-         ; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'build))))
-;      (propagated-inputs
-;       `(("go-golang-org-x-net" ,go-golang-org-x-net)))
-      (synopsis "Supplemental Go time libraries")
-      (description "This package provides supplemental Go libraries related to
-time.")
-      (home-page "https://godoc.org/golang.org/x/time/rate")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-oauth2
   (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
         (revision "1"))
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 23/30] gnu: go-golang-org-x-text: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:16f7c613eef9d08f5d7fdddede4ac8e156f4f366.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-text): Move from here ...
* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/admin.scm: Add (gnu packages golang-build) module.
* gnu/packages/bioinformatics.scm: As above.
* gnu/packages/mail.scm: As above.

Change-Id: Ifd15b35b460ae30c5c1d677551e95842b322b246
---
 gnu/packages/admin.scm          |  1 +
 gnu/packages/bioinformatics.scm |  1 +
 gnu/packages/golang-build.scm   | 29 +++++++++++++++++++++++++++++
 gnu/packages/golang.scm         | 28 ----------------------------
 gnu/packages/mail.scm           |  1 +
 5 files changed, 32 insertions(+), 28 deletions(-)

Toggle diff (122 lines)diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2dbb604fa9..c595e1270f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -130,6 +130,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 554df0b42f..08683bc8e9 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages graph)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 3885701078..325470ca4e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
@@ -292,6 +293,34 @@ (define-public go-golang-org-x-term
 terminals, as commonly found on Unix systems.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-text
+  (package
+    (name "go-golang-org-x-text")
+    (version "0.3.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/text")
+             (commit (string-append "v" version))))
+       (file-name (string-append "go.googlesource.com-text-"
+                                 version "-checkout"))
+       (sha256
+        (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "golang.org/x/text"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build))))
+    (home-page "https://go.googlesource.com/text")
+    (synopsis "Supplemental Go text processing libraries")
+    (description "This package provides supplemental Go libraries for text
+processing.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-time
   (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
         (revision "2"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6c056e19a9..eb4740f91e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3559,34 +3559,6 @@ (define-public go-golang-org-x-image
 processing.")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-text
-  (package
-    (name "go-golang-org-x-text")
-    (version "0.3.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/text")
-                    (commit (string-append "v" version))))
-              (file-name (string-append "go.googlesource.com-text-"
-                                        version "-checkout"))
-              (sha256
-               (base32
-                "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "golang.org/x/text"
-       ; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))
-    (synopsis "Supplemental Go text processing libraries")
-    (description "This package provides supplemental Go libraries for text
-    processing.")
-    (home-page "https://go.googlesource.com/text")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-oauth2
   (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
         (revision "1"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 76f379a710..4a439d2f8f 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 25/30] gnu: go-golang-org-x-tools: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:5cd83eff78a49ce77dae363adcca96437fd6e276.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-tools): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: Ib9a69a5dab73b6f9d935fd0216658f5e4f8cf1f8

---

gnu/packages/golang-build.scm | 39 +++++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 41 -----------------------------------

2 files changed, 39 insertions(+), 41 deletions(-)

Toggle diff (104 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b2b2872907..87f184fb14 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -373,6 +373,45 @@ (define-public go-golang-org-x-time
 time.")
       (license license:bsd-3))))
 
+(define-public go-golang-org-x-tools
+  (package
+    (name "go-golang-org-x-tools")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/tools")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; gopls versions are tagged separately, and it is a
+           ;; separate Guix package.
+           (delete-file-recursively "gopls")))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "golang.org/x/tools"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; Source-only package
+         (delete 'build))))
+    (propagated-inputs
+     (list go-github-com-yuin-goldmark
+           go-golang-org-x-mod
+           go-golang-org-x-net
+           go-golang-org-x-sys))
+    (home-page "https://go.googlesource.com/tools/")
+    (synopsis "Tools that support the Go programming language")
+    (description "This package provides miscellaneous tools that support the
+Go programming language.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-xerrors
   (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 22a76daef4..4c2781bf45 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,47 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
-(define-public go-golang-org-x-tools
-  (package
-    (name "go-golang-org-x-tools")
-    (version "0.5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://go.googlesource.com/tools")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; gopls versions are tagged separately, and it is a
-           ;; separate Guix package.
-           (delete-file-recursively "gopls")))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "golang.org/x/tools"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
-    (propagated-inputs
-     (list
-      go-github-com-yuin-goldmark
-      go-golang-org-x-mod
-      go-golang-org-x-net
-      go-golang-org-x-sys))
-    (synopsis "Tools that support the Go programming language")
-    (description "This package provides miscellaneous tools that support the
-Go programming language.")
-    (home-page "https://go.googlesource.com/tools/")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-crypto
   (package
     (name "go-golang-org-x-crypto")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 28/30] gnu: go-github-com-klauspost-compress: Move to golang-compression.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:18189b3a497162b1e050709116224c2b5ceb9159.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-klauspost-compress): Move from here ...
* gnu/packages/golang-compression.scm: ... to here.

* gnu/packages/golang-compression.scm: Add (gnu packages
golang-compression) module.
* gnu/packages/golang-crypto.scm: As above.
* gnu/packages/golang-web.scm: As above.
* gnu/packages/uucp.scm: As above.

Change-Id: Ia99f1e6aae7f75940fc150eb02862c0b3e9f3325
---
 gnu/packages/golang-compression.scm | 31 ++++++++++++++++++++++++++++
 gnu/packages/golang-crypto.scm      |  3 ++-
 gnu/packages/golang-web.scm         |  1 +
 gnu/packages/golang.scm             | 32 -----------------------------
 gnu/packages/uucp.scm               |  1 +
 5 files changed, 35 insertions(+), 33 deletions(-)

Toggle diff (125 lines)diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 670572ea90..5aacc34a66 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -56,6 +56,37 @@ (define-public go-github-com-golang-snappy
 compression format.")
     (license license:bsd-3)))
 
+(define-public go-github-com-klauspost-compress
+  (package
+    (name "go-github-com-klauspost-compress")
+    (version "1.13.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/klauspost/compress")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/klauspost/compress"
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'reset-gzip-timestamps 'fix-permissions
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Provide write permissions on gzip files so that
+             ;; reset-gzip-timestamps has sufficient permissions.
+             (for-each make-file-writable
+                       (find-files (assoc-ref outputs "out") ".gz$")))))))
+    (propagated-inputs
+     (list go-github-com-golang-snappy))
+    (home-page "https://github.com/klauspost/compress")
+    (synopsis "Go compression library")
+    (description "@code{compress} provides various compression algorithms.")
+    (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-crypto.scm b/gnu/packages/golang-crypto.scm
index 39e7412558..58fd9cb250 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -45,7 +45,8 @@ (define-module (gnu packages golang-crypto)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
-  #:use-module (gnu packages golang-check))
+  #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d7fb7dd366..28a9fad113 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages golang-web)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages tls)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e473c0880b..24ca39fc58 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9477,38 +9477,6 @@ (define-public go-github-com-dustin-go-humanize
 back.")
     (license license:expat)))
 
-(define-public go-github-com-klauspost-compress
-  (package
-    (name "go-github-com-klauspost-compress")
-    (version "1.13.1")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/klauspost/compress")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/klauspost/compress"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'reset-gzip-timestamps 'fix-permissions
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Provide write permissions on gzip files so that
-             ;; reset-gzip-timestamps has sufficient permissions.
-             (for-each make-file-writable
-                       (find-files (assoc-ref outputs "out") ".gz$")))))))
-    (propagated-inputs
-     (list go-github-com-golang-snappy))
-    (home-page "https://github.com/klauspost/compress")
-    (synopsis "Go compression library")
-    (description "@code{compress} provides various compression algorithms.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-oneofone-xxhash
   (package
     (name "go-github-com-oneofone-xxhash")
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 8f1759556e..8e47834fef 100644
--- a/gnu/packages/uucp.scm
+++ b/gnu/packages/uucp.scm
@@ -20,6 +20,7 @@
 (define-module (gnu packages uucp)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages texinfo)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 27/30] gnu: go-golang-org-x-crypto: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:655064a2e27c14c8b5d7d20e0632b3b033ee8e9a.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-crypto): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/backup.scm: Add (gnu packages golang-build) module.

* gnu/packages/crypto.scm: As above.

Change-Id: I5daad7fe90e1507958fe73c04fc043ebbc006395

---

gnu/packages/backup.scm | 1 +

gnu/packages/crypto.scm | 1 +

gnu/packages/golang-build.scm | 34 +++++++++++++++++++++++++++++++++-

gnu/packages/golang.scm | 31 -------------------------------

4 files changed, 35 insertions(+), 32 deletions(-)

Toggle diff (127 lines)diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index f160efd37d..3b3b9d332a 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages backup)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index c7145bcb0c..6857ea2075 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -60,6 +60,7 @@ (define-module (gnu packages crypto)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kerberos)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b717c3ad27..8b7dca46a6 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,14 +1,15 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
+;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
-;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
@@ -74,6 +75,37 @@ (define-public go-github-com-yuin-goldmark
     (description "This package provides a markdown parser.")
     (license license:expat)))
 
+(define-public go-golang-org-x-crypto
+  (package
+    (name "go-golang-org-x-crypto")
+    (version "0.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/crypto")
+             (commit (string-append "v" version))))
+       (file-name (string-append "go.googlesource.com-crypto-"
+                                 version "-checkout"))
+       (sha256
+        (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/crypto"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; Source-only package
+         (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (home-page "https://go.googlesource.com/crypto/")
+    (synopsis "Supplementary cryptographic libraries in Go")
+    (description "This package provides supplementary cryptographic libraries
+for the Go language.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-exp
   (package
     (name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0437b4e83d..e473c0880b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3347,37 +3347,6 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
-(define-public go-golang-org-x-crypto
-  (package
-    (name "go-golang-org-x-crypto")
-    (version "0.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/crypto")
-                    (commit (string-append "v" version))))
-              (file-name (string-append "go.googlesource.com-crypto-"
-                                        version "-checkout"))
-              (sha256
-               (base32
-                "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "golang.org/x/crypto"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
-    (propagated-inputs
-     (list go-golang-org-x-sys))
-    (synopsis "Supplementary cryptographic libraries in Go")
-    (description "This package provides supplementary cryptographic libraries
-for the Go language.")
-    (home-page "https://go.googlesource.com/crypto/")
-    (license license:bsd-3)))
-
 (define-public govulncheck
   (package
     (name "govulncheck")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 30/30] gnu: go-github.com-ulikunitz-xz: Move to golang-compression.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:0043354dba89731bea56cb9cdef26df342502c7b.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github.com-ulikunitz-xz): Move from here ...

* gnu/packages/golang-compression.scm: ... to here.

* gnu/packages/admin.scm: Add (gnu packages golang-compression) module.

* gnu/packages/bioinformatics.scm: As above.

Change-Id: I1901e67ac4336efd356085332572b3f09de90f7a

---

gnu/packages/admin.scm | 1 +

gnu/packages/bioinformatics.scm | 1 +

gnu/packages/golang-compression.scm | 23 +++++++++++++++++++++++

gnu/packages/golang.scm | 22 ----------------------

4 files changed, 25 insertions(+), 22 deletions(-)

Toggle diff (99 lines)diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c595e1270f..11f69e57a4 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -131,6 +131,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 08683bc8e9..bcfe3c2656 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -95,6 +95,7 @@ (define-module (gnu packages bioinformatics)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages graph)
   #:use-module (gnu packages graphics)
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 6a556daa25..568fdd12b9 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -114,6 +115,28 @@ (define-public go-github-com-klauspost-compress
     (description "@code{compress} provides various compression algorithms.")
     (license license:bsd-3)))
 
+(define-public go-github.com-ulikunitz-xz
+  (package
+    (name "go-github.com-ulikunitz-xz")
+    (version "0.5.8")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ulikunitz/xz.git")
+             (commit (string-append "v" version))))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32 "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/ulikunitz/xz"))
+    (home-page "https://github.com/ulikunitz/xz")
+    (synopsis "Read and write xz compressed streams in Go")
+    (description "This package provides a library to read and write xz
+compressed streams in Go.")
+    (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 644121a761..7d1ae9699b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8968,28 +8968,6 @@ (define-public go-github-com-tekwizely-go-parsing
 parsers, and related tools.")
       (license license:expat))))
 
-(define-public go-github.com-ulikunitz-xz
-  (package
-    (name "go-github.com-ulikunitz-xz")
-    (version "0.5.8")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/ulikunitz/xz.git")
-                    (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/ulikunitz/xz"))
-    (synopsis "Read and write xz compressed streams in Go")
-    (description "This package provides a library to read and write xz
-compressed streams in Go.")
-    (home-page "https://github.com/ulikunitz/xz")
-    (license license:bsd-3)))
-
 (define-public go-github-com-songmu-gitconfig
   (package
     (name "go-github-com-songmu-gitconfig")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 10/30] gnu: go-github-com-davecgh-go-spew: Move to golang-check.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:73fbe29e8db759772125ea219a81154b336b8888.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-davecgh-go-spew): Move

from here ...

* gnu/packages/golang-check.scm: ... to here.

* gnu/packages/high-availability.scm: Add (gnu packages golang-check) module.

Change-Id: I935006c3656b7bf18b91e529296778672338f094

---

gnu/packages/golang-check.scm | 38 ++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 38 ------------------------------

gnu/packages/high-availability.scm | 1 +

3 files changed, 39 insertions(+), 38 deletions(-)

Toggle diff (112 lines)diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 2decd1f664..c5e30f7fe1 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -124,6 +124,44 @@ (define-public go-github-com-cheekybits-is
 @end itemize\n")
       (license license:expat))))
 
+(define-public go-github-com-davecgh-go-spew
+  (package
+    (name "go-github-com-davecgh-go-spew")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/davecgh/go-spew")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:unpack-path "github.com/davecgh/go-spew"
+       #:import-path "github.com/davecgh/go-spew/spew"))
+    (home-page "https://github.com/davecgh/go-spew")
+    (synopsis "Deep pretty printer for Go data structures to aid in debugging")
+    (description "Package @command{spew} implements a deep pretty printer
+for Go data structures to aid in debugging.
+
+A quick overview of the additional features spew provides over the built-in
+printing facilities for Go data types are as follows:
+
+@itemize
+@item Pointers are dereferenced and followed.
+@item Circular data structures are detected and handled properly.
+@item Custom Stringer/error interfaces are optionally invoked, including on
+unexported types.
+@item Custom types which only implement the Stringer/error interfaces via a
+pointer receiver are optionally invoked when passing non-pointer variables.
+@item Byte arrays and slices are dumped like the hexdump -C command which
+includes offsets, byte values in hex, and ASCII output (only when using Dump
+style).
+@end itemize")
+    (license license:isc)))
+
 (define-public go-github-com-frankban-quicktest
   (package
     (name "go-github-com-frankban-quicktest")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 599fdf9f2d..903f2126c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5344,44 +5344,6 @@ (define-public go-github-com-libp2p-go-flow-metrics
 that's a lot faster (and only does simple bandwidth metrics).")
       (license license:expat))))
 
-(define-public go-github-com-davecgh-go-spew
-  (package
-    (name "go-github-com-davecgh-go-spew")
-    (version "1.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/davecgh/go-spew")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:unpack-path "github.com/davecgh/go-spew"
-       #:import-path "github.com/davecgh/go-spew/spew"))
-    (home-page "https://github.com/davecgh/go-spew")
-    (synopsis "Deep pretty printer for Go data structures to aid in debugging")
-    (description "Package @command{spew} implements a deep pretty printer
-for Go data structures to aid in debugging.
-
-A quick overview of the additional features spew provides over the built-in printing facilities for Go data types are as follows:
-
-@itemize
-@item Pointers are dereferenced and followed.
-@item Circular data structures are detected and handled properly.
-@item Custom Stringer/error interfaces are optionally invoked, including on
-unexported types.
-@item Custom types which only implement the Stringer/error interfaces via a
-pointer receiver are optionally invoked when passing non-pointer variables.
-@item Byte arrays and slices are dumped like the hexdump -C command which
-includes offsets, byte values in hex, and ASCII output (only when using Dump
-style).
-@end itemize\n")
-    (license license:isc)))
-
 (define-public go-github-com-btcsuite-btclog
   (let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a")
         (revision "0"))
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index ad18a39738..0678edaf4e 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 01/30] gnu: Add (gnu packages golang-build) module.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e6295f25eabb9fcc8765561825ab7c9b124c1568.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang-build.scm: New file.

* gnu/local.mk: Add to gnu/packages/golang-build.scm scope.

Change-Id: I4605d44452859b47ed6369a234c7ead496b19c2a

---

gnu/local.mk | 1 +

gnu/packages/golang-build.scm | 44 +++++++++++++++++++++++++++++++++++

2 files changed, 45 insertions(+)

create mode 100644 gnu/packages/golang-build.scm

Toggle diff (66 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index 7806771eea..e40be7fb46 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -307,6 +307,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/gnu-pw-mgr.scm			\
   %D%/packages/gobby.scm			\
   %D%/packages/golang.scm			\
+  %D%/packages/golang-build.scm		\
   %D%/packages/golang-check.scm		\
   %D%/packages/golang-crypto.scm	      	\
   %D%/packages/golang-web.scm	        	\
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
new file mode 100644
index 0000000000..03fcdede80
--- /dev/null
+++ b/gnu/packages/golang-build.scm
@@ -0,0 +1,44 @@
+;;; 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-build)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system go)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; Modules (libraries) which are part of the Golang project but outside the
+;;; main Golang tree, see <https://pkg.go.dev/golang.org/x>
+;;;
+;;; Since they are bound to be relied on by many, their dependencies should be
+;;; kept minimal, and this module should not depend on other modules
+;;; containing Golang packages.
+;;;
+;;; 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.
+;;;

base-commit: bb92a4d7bc71197a51eea9075387c5313f299085
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 05/30] gnu: go-github-com-mreiferson-go-options: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:fc8db1c05b0ab7cc8b5df90bcd2a37a360df0edc.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-mreiferson-go-options): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Ia5cf19a48812b56b0b38ed80246a65c345454c79

---

gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++

gnu/packages/golang.scm | 23 -----------------------

2 files changed, 24 insertions(+), 23 deletions(-)

Toggle diff (77 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 33aa43357f..ebcf333b13 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
@@ -146,6 +147,29 @@ (define-public go-github-com-matryer-try
     (description "This package provides an idiomatic Go retry module.")
     (license license:expat)))
 
+(define-public go-github-com-mreiferson-go-options
+  (package
+    (name "go-github-com-mreiferson-go-options")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mreiferson/go-options")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/mreiferson/go-options"))
+    (home-page "https://github.com/mreiferson/go-options")
+    (synopsis "Go package to structure and resolve options")
+    (description
+     "The @code{options} Go package resolves configuration values set via
+command line flags, config files, and default struct values.")
+    (license license:expat)))
+
 (define-public go-github-com-nats-io-nats-go
   (package
     (name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 43e9024167..73e7077eac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5515,29 +5515,6 @@ (define-public go-github-com-mr-tron-base58
 encoding and 8 times faster decoding.")
       (license license:expat))))
 
-(define-public go-github-com-mreiferson-go-options
-  (package
-    (name "go-github-com-mreiferson-go-options")
-    (version "1.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/mreiferson/go-options")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/mreiferson/go-options"))
-    (home-page "https://github.com/mreiferson/go-options")
-    (synopsis "Go package to structure and resolve options")
-    (description
-     "The @code{options} Go package resolves configuration values set via
-command line flags, config files, and default struct values.")
-    (license license:expat)))
-
 (define-public go-github-com-mreiferson-go-svc
   ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
   ;; does not support go.mod with `replace' statement.
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 06/30] gnu: go-golang-org-x-sys: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:6f55a41cdac3f1e46e6242c5d6d73f95599cb25f.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-sys): Move
from here ...
* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/curl.scm: Add (gnu packages golang-build) module.
* gnu/packages/databases.scm: As above.
* gnu/packages/docker.scm: As above.
* gnu/packages/golang-build.scm: As above.
* gnu/packages/golang.scm: As above.
* gnu/packages/irc.scm: As above.
* gnu/packages/linux.scm: As above.
* gnu/packages/password-utils.scm: As above.
* gnu/packages/syncthing.scm: As above.
* gnu/packages/textutils.scm: As above.
* gnu/packages/vpn.scm: As above.
* gnu/packages/weather.scm: As above.
* gnu/packages/web.scm: As above.

Change-Id: I161e89cacb9aa87b4fbb643ecd9ad32cfe49c9d7
---
 gnu/packages/curl.scm           |  1 +
 gnu/packages/databases.scm      |  1 +
 gnu/packages/docker.scm         |  1 +
 gnu/packages/golang-build.scm   | 31 +++++++++++++++++++++++++++++++
 gnu/packages/golang.scm         | 31 -------------------------------
 gnu/packages/irc.scm            |  1 +
 gnu/packages/linux.scm          |  1 +
 gnu/packages/password-utils.scm |  1 +
 gnu/packages/syncthing.scm      |  1 +
 gnu/packages/textutils.scm      |  1 +
 gnu/packages/vpn.scm            |  1 +
 gnu/packages/weather.scm        |  3 ++-
 gnu/packages/web.scm            |  1 +
 13 files changed, 43 insertions(+), 32 deletions(-)

Toggle diff (220 lines)diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 0fb83a7a12..02a602a66d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages curl)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages logging)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 903088ed4b..dc4a91f14d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -107,6 +107,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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index fbe8edeef0..0fe1f2c1c7 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages docker)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 2601dec27a..eeab951f1e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -101,6 +101,37 @@ (define-public go-golang-org-x-net-html
     (description
      "This package provides an HTML5-compliant tokenizer and parser.")))
 
+(define-public go-golang-org-x-sys
+  (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
+        (revision "0"))
+    (package
+      (name "go-golang-org-x-sys")
+      (version (git-version "0.8.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/sys")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:import-path "golang.org/x/sys"
+        ;; Source-only package
+        #:tests? #f
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; Source-only package
+            (delete 'build))))
+      (home-page "https://go.googlesource.com/sys")
+      (synopsis "Go support for low-level system interaction")
+      (description "This package provides supplemental libraries offering Go
+support for low-level interaction with the operating system.")
+      (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 73e7077eac..373b57c5ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3712,37 +3712,6 @@ (define-public go-golang-org-x-sync
       (home-page "https://go.googlesource.com/sync/")
       (license license:bsd-3))))
 
-(define-public go-golang-org-x-sys
-  (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-sys")
-      (version (git-version "0.8.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/sys")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
-      (build-system go-build-system)
-      (arguments
-       (list
-        #:import-path "golang.org/x/sys"
-        ;; Source-only package
-        #:tests? #f
-        #:phases
-        #~(modify-phases %standard-phases
-            ;; Source-only package
-            (delete 'build))))
-      (synopsis "Go support for low-level system interaction")
-      (description "This package provides supplemental libraries offering Go
-support for low-level interaction with the operating system.")
-      (home-page "https://go.googlesource.com/sys")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 3200ccc135..c211fa6595 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-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b8b119e474..d798c44a8f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -134,6 +134,7 @@ (define-module (gnu packages linux)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 6dc257dc0e..3a2bb410f2 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -91,6 +91,7 @@ (define-module (gnu packages password-utils)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index c0270b87e5..dbca1e5e90 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages syncthing)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index be5cb15cb8..25de916fcb 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages textutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages java)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 0070eaab6f..7823ef19eb 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages vpn)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm
index 6ba656017f..5a58b97a30 100644
--- a/gnu/packages/weather.scm
+++ b/gnu/packages/weather.scm
@@ -22,7 +22,8 @@ (define-module (gnu packages weather)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (gnu packages)
-  #:use-module (gnu packages golang))
+  #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build))
 
 (define-public wego
   (package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a1039b9e0c..0c67e7d6e4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -143,6 +143,7 @@ (define-module (gnu packages web)
   #:use-module (gnu packages gnunet)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 21/30] gnu: go-golang-org-x-term: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:9dad8fd76406d479df5acee5f32e447fc9b18779.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-term): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/disk.scm: Add (gnu packages golang-build) module.

* gnu/packages/image-viewers.scm: As above.

Change-Id: Ibdb637bb129437ef74a0270fd44edc8804bb3055

---

gnu/packages/disk.scm | 1 +

gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++

gnu/packages/golang.scm | 24 ------------------------

gnu/packages/image-viewers.scm | 1 +

4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (109 lines)diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 165f0a8a74..b0117d77ce 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages disk)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 7b8653960d..db94ad2c7b 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -4,11 +4,13 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -267,6 +269,29 @@ (define-public go-golang-org-x-sys
 support for low-level interaction with the operating system.")
       (license license:bsd-3))))
 
+(define-public go-golang-org-x-term
+  (package
+    (name "go-golang-org-x-term")
+    (version "0.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/term")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "golang.org/x/term"))
+    (propagated-inputs
+     (list go-golang-org-x-sys))
+    (home-page "https://pkg.go.dev/golang.org/x/term")
+    (synopsis "Go terminal/console support")
+    (description "@code{term} provides support functions for dealing with
+terminals, as commonly found on Unix systems.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-xerrors
   (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8bfabb9da9..240c87c3ba 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9659,30 +9659,6 @@ (define-public go-github-com-dustin-go-humanize
 back.")
     (license license:expat)))
 
-(define-public go-golang-org-x-term
-  (package
-    (name "go-golang-org-x-term")
-    (version "0.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://go.googlesource.com/term")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
-    (build-system go-build-system)
-    (arguments '(#:import-path "golang.org/x/term"))
-    (propagated-inputs
-     (list go-golang-org-x-sys))
-    (home-page "https://pkg.go.dev/golang.org/x/term")
-    (synopsis "Go terminal/console support")
-    (description "@code{term} provides support functions for dealing with
-terminals, as commonly found on Unix systems.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-klauspost-compress
   (package
     (name "go-github-com-klauspost-compress")
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 206b91c878..f2b87268f0 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages image-viewers)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages image)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 24/30] gnu: go-github-com-yuin-goldmark: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:cb269c640691e3167ca8c626f15b1d41f96cf497.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-yuin-goldmark): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

Change-Id: If553b4a00b288a913d1d54da8b5b52eab87bb277

---

gnu/packages/golang-build.scm | 22 ++++++++++++++++++++++

gnu/packages/golang.scm | 21 ---------------------

2 files changed, 22 insertions(+), 21 deletions(-)

Toggle diff (74 lines)diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 325470ca4e..b2b2872907 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -51,6 +52,27 @@ (define-module (gnu packages golang-build)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-yuin-goldmark
+  (package
+    (name "go-github-com-yuin-goldmark")
+    (version "1.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/yuin/goldmark")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/yuin/goldmark"))
+    (home-page "https://github.com/yuin/goldmark/")
+    (synopsis "Markdown parser")
+    (description "This package provides a markdown parser.")
+    (license license:expat)))
+
 (define-public go-golang-org-x-exp
   (package
     (name "go-golang-org-x-exp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eb4740f91e..22a76daef4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7925,27 +7925,6 @@ (define-public go-github-com-olekukonko-ts
 size of the terminal.")
       (license license:expat))))
 
-(define-public go-github-com-yuin-goldmark
-  (package
-    (name "go-github-com-yuin-goldmark")
-    (version "1.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/yuin/goldmark")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/yuin/goldmark"))
-    (home-page "https://github.com/yuin/goldmark/")
-    (synopsis "Markdown parser")
-    (description "This package provides a markdown parser.")
-    (license license:expat)))
-
 (define-public go-github-com-charmbracelet-glamour
   (package
     (name "go-github-com-charmbracelet-glamour")
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 26/30] gnu: go-golang-org-x-image: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:7d85f4e56662d00a63190cd687280466452bfa84.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang-org-x-image): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/game.scm: Add (gnu packages golang-build) module.

Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede

---

gnu/packages/games.scm | 1 +

gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 30 ------------------------------

3 files changed, 32 insertions(+), 30 deletions(-)

Toggle diff (104 lines)diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f95681fbb7..c257a2cfe8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -150,6 +150,7 @@ (define-module (gnu packages games)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages graphviz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 87f184fb14..b717c3ad27 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 HiPhish <hiphish@posteo.de>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -99,6 +100,36 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-image
+  (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
+        (revision "1"))
+    (package
+      (name "go-golang-org-x-image")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/image")
+               (commit commit)))
+         (file-name (string-append "go.googlesource.com-image-"
+                                   version "-checkout"))
+         (sha256
+          (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
+      (build-system go-build-system)
+      (arguments
+       `(#:import-path "golang.org/x/image"
+         ;; Source-only package
+         #:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'build))))
+      (home-page "https://go.googlesource.com/image")
+      (synopsis "Supplemental Go image libraries")
+      (description "This package provides supplemental Go libraries for image
+processing.")
+      (license license:bsd-3))))
+
 (define-public go-golang-org-x-mod
   (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4c2781bf45..0437b4e83d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3488,36 +3488,6 @@ (define-public gopls
 editor.")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-image
-  (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
-        (revision "1"))
-    (package
-      (name "go-golang-org-x-image")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://go.googlesource.com/image")
-                       (commit commit)))
-                (file-name (string-append "go.googlesource.com-image-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/image"
-         ; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'build))))
-      (home-page "https://go.googlesource.com/image")
-      (synopsis "Supplemental Go image libraries")
-      (description "This package provides supplemental Go libraries for image
-processing.")
-      (license license:bsd-3))))
-
 (define-public go-golang-org-x-oauth2
   (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33")
         (revision "1"))
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 11/30] gnu: go-github-com-burntsushi-toml: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:738bfdf889ad773577d6fac378ad65bd881ecacb.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-burntsushi-toml): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/golang-check.scm: Add (gnu packages golang-xyz) module.
* gnu/packages/golang.scm: As above.
* gnu/packages/shellutils.scm: As above.

Change-Id: If8a645431a1fb17159681daae70db49fd21b37c1
---
 gnu/packages/golang-check.scm |  3 ++-
 gnu/packages/golang-xyz.scm   | 26 ++++++++++++++++++++++++++
 gnu/packages/golang.scm       | 24 +-----------------------
 gnu/packages/shellutils.scm   |  1 +
 4 files changed, 30 insertions(+), 24 deletions(-)

Toggle diff (113 lines)diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index c5e30f7fe1..8ce85421e9 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -42,7 +42,8 @@ (define-module (gnu packages golang-check)
   #:use-module (guix git-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages golang)
-  #:use-module (gnu packages golang-build))
+  #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-xyz))
 
 ;;; Commentary:
 ;;;
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 1999aab7fb..9d2b43b86c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +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 © 2023 Benjamin <benjamin@uvy.fr>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -41,6 +44,29 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-burntsushi-toml
+  (package
+    (name "go-github-com-burntsushi-toml")
+    (version "1.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/BurntSushi/toml")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/BurntSushi/toml"))
+    (home-page "https://github.com/BurntSushi/toml")
+    (synopsis "Toml parser and encoder for Go")
+    (description
+     "This package is toml parser and encoder for Go.  The interface is
+similar to Go's standard library @code{json} and @code{xml} package.")
+    (license license:expat)))
+
 (define-public go-github-com-djherbis-atime
   (package
     (name "go-github-com-djherbis-atime")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 903f2126c4..5f8a550b15 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages golang)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mail)
   #:use-module (gnu packages mp3)
@@ -3807,29 +3808,6 @@ (define-public go-golang-org-x-mod
 loading algorithms.")
       (license license:bsd-3))))
 
-(define-public go-github-com-burntsushi-toml
-  (package
-    (name "go-github-com-burntsushi-toml")
-    (version "1.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/BurntSushi/toml")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/BurntSushi/toml"))
-    (home-page "https://github.com/BurntSushi/toml")
-    (synopsis "Toml parser and encoder for Go")
-    (description
-     "This package is toml parser and encoder for Go.  The interface
-is similar to Go's standard library @code{json} and @code{xml} package.")
-    (license license:expat)))
-
 (define-public go-github-com-hashicorp-go-uuid
   (package
     (name "go-github-com-hashicorp-go-uuid")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 00352dc327..48c5250c8c 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -51,6 +51,7 @@ (define-module (gnu packages shellutils)
   #:use-module (gnu packages check)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 15/30] gnu: go-github-com-bitly-go-hostpool: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:02465c9c3650cc14b8814ee91b96bdf2ed73f262.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-bitly-go-hostpool): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: Ia314e6134f229c004f23d99a9c42dbd0adf105f8
---
 gnu/packages/golang-xyz.scm        | 25 +++++++++++++++++++++++++
 gnu/packages/golang.scm            | 25 -------------------------
 gnu/packages/high-availability.scm |  1 +
 3 files changed, 26 insertions(+), 25 deletions(-)

Toggle diff (86 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a396057da9..f3087149e7 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -45,6 +45,31 @@ (define-module (gnu packages golang-xyz)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-bitly-go-hostpool
+  (package
+    (name "go-github-com-bitly-go-hostpool")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bitly/go-hostpool")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/bitly/go-hostpool"))
+    (native-inputs (list go-github-com-stretchr-testify))
+    (home-page "https://github.com/bitly/go-hostpool")
+    (synopsis "Pool among multiple hosts from Golang")
+    (description
+     "This package provides a Go package to intelligently and flexibly pool among
+multiple hosts from your Go application.  Host selection can operate in round
+robin or epsilon greedy mode, and unresponsive hosts are avoided.")
+    (license license:expat)))
+
 (define-public go-github-com-bitly-timer-metrics
   (package
     (name "go-github-com-bitly-timer-metrics")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d594759bdf..4a8e9dbc78 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1881,31 +1881,6 @@ (define-public go-github-com-dhowett-go-plist
 types.")
       (license license:giftware))))
 
-(define-public go-github-com-bitly-go-hostpool
-  (package
-    (name "go-github-com-bitly-go-hostpool")
-    (version "0.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/bitly/go-hostpool")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1iibj7dwymczw7cknrh6glc6sdpp4yap2plnyr8qphynwrzlz73w"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/bitly/go-hostpool"))
-    (native-inputs (list go-github-com-stretchr-testify))
-    (home-page "https://github.com/bitly/go-hostpool")
-    (synopsis "Pool among multiple hosts from Golang")
-    (description
-     "This package provides a Go package to intelligently and flexibly pool among
-multiple hosts from your Go application.  Host selection can operate in round
-robin or epsilon greedy mode, and unresponsive hosts are avoided.")
-    (license license:expat)))
-
 (define-public go-github-com-blanu-dust
   (package
     (name "go-github-com-blanu-dust")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 0678edaf4e..b0e6631389 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages high-availability)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 29/30] gnu: go-github-com-andybalholm-brotli: Move to golang-compression.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:f123e7560dc60efe46362538a687cc4e7e5a78a7.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-andybalholm-brotli): Move from here ...

* gnu/packages/golang-compression.scm: ... to here.

Change-Id: I820b0211b1fe4d90643e82fc32a99d8e8b6a9b0f

---

gnu/packages/golang-compression.scm | 27 +++++++++++++++++++++++++++

gnu/packages/golang.scm | 26 --------------------------

2 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (84 lines)diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 5aacc34a66..6a556daa25 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,32 @@ (define-module (gnu packages golang-compression)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-andybalholm-brotli
+  (package
+    (name "go-github-com-andybalholm-brotli")
+    (version "1.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/andybalholm/brotli")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/andybalholm/brotli"))
+    (home-page "https://github.com/andybalholm/brotli")
+    (synopsis "Pure Go Brotli encoder and decoder")
+    (description
+     "This package is a brotli compressor and decompressor implemented in Go.
+It was translated from the reference implementation
+(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
+the @code{c2go} tool at
+@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
+    (license license:expat)))
+
 (define-public go-github-com-golang-snappy
   (package
     (name "go-github-com-golang-snappy")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 24ca39fc58..644121a761 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3722,32 +3722,6 @@ (define-public go-github-com-google-cadvisor
 containers.")
       (license license:asl2.0))))
 
-(define-public go-github-com-andybalholm-brotli
-  (package
-    (name "go-github-com-andybalholm-brotli")
-    (version "1.0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/andybalholm/brotli")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/andybalholm/brotli"))
-    (home-page "https://github.com/andybalholm/brotli")
-    (synopsis "Pure Go Brotli encoder and decoder")
-    (description
-     "This package is a brotli compressor and decompressor implemented in Go.
-It was translated from the reference implementation
-(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with
-the @code{c2go} tool at
-@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
-    (license license:expat)))
-
 (define-public go-github-com-jonboulle-clockwork
   (let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
         (revision "0"))
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 02/30] gnu: Add (gnu packages golang-compression) module.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:e23a7afa5e34c5bf3b1d4de4d928d17db804b45c.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang-compression.scm: New file.

* gnu/local.mk: Add to gnu/packages/golang-compression.scm scope.

Change-Id: I1c68a3f6f9b3d6a316cba560b7fc81e707376417

---

gnu/local.mk | 1 +

gnu/packages/golang-compression.scm | 37 +++++++++++++++++++++++++++++

2 files changed, 38 insertions(+)

create mode 100644 gnu/packages/golang-compression.scm

Toggle diff (57 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index e40be7fb46..bb62c87bb6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -309,6 +309,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/golang.scm			\
   %D%/packages/golang-build.scm		\
   %D%/packages/golang-check.scm		\
+  %D%/packages/golang-compression.scm		\
   %D%/packages/golang-crypto.scm	      	\
   %D%/packages/golang-web.scm	        	\
   %D%/packages/golang-xyz.scm	        	\
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
new file mode 100644
index 0000000000..268cd16e30
--- /dev/null
+++ b/gnu/packages/golang-compression.scm
@@ -0,0 +1,37 @@
+;;; 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-compression)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system go)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages))
+
+;;; Commentary:
+;;;
+;;; 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

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 19/30] gnu: go-golang.org-x-sync-errgroup: Move to golang-build.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:722456bf1a229679af5a3cb8349b5db375f2fc54.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-golang.org-x-sync-errgroup,

go-golang.org-x-sync-semaphore): Move from here ...

* gnu/packages/golang-build.scm: ... to here.

* gnu/packages/check.scm: Add (gnu packages golang-build) module.

Change-Id: Ie886c0f44e0a70629e23371b447f5a35006ade21

---

gnu/packages/check.scm | 1 +

gnu/packages/golang-build.scm | 41 +++++++++++++++++++++++++++++++++++

gnu/packages/golang.scm | 38 --------------------------------

gnu/packages/terminals.scm | 1 +

4 files changed, 43 insertions(+), 38 deletions(-)

Toggle diff (139 lines)diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4f593cde8d..b520d6c58a 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages check)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index fed606e8fb..8e64571929 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -1,11 +1,14 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 hackeryarn <artemchernyak@gmail.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -165,6 +168,44 @@ (define-public go-golang-org-x-net-html
     (description
      "This package provides an HTML5-compliant tokenizer and parser.")))
 
+(define-public go-golang.org-x-sync-errgroup
+  (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
+        (revision "0"))
+    (package
+      (name "go-golang.org-x-sync-errgroup")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://go.googlesource.com/sync")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "golang.org/x/sync/errgroup"
+         #:unpack-path "golang.org/x/sync"))
+      (home-page "https://godoc.org/golang.org/x/sync/errgroup")
+      (synopsis "Synchronization, error propagation, and Context cancellation
+for groups of goroutines working on subtasks of a common task")
+      (description "This package provides synchronization, error
+propagation, and Context cancellation for groups of goroutines working on
+subtasks of a common task.")
+      (license license:bsd-3))))
+
+(define-public go-golang.org-x-sync-semaphore
+  (package
+    (inherit go-golang.org-x-sync-errgroup)
+    (name "go-golang.org-x-sync-semaphore")
+    (arguments
+     '(#:import-path "golang.org/x/sync/semaphore"
+       #:unpack-path "golang.org/x/sync"))
+    (home-page "https://godoc.org/golang.org/x/sync/semaphore")
+    (synopsis "Weighted semaphore implementation in Go")
+    (description "Weighted semaphore implementation in Go.")))
+
 (define-public go-golang-org-x-sys
   (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 68b905ff8b..7e5626a303 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7023,44 +7023,6 @@ (define-public go-github-com-google-renameio
 create or replace a file or symbolic link.")
     (license license:asl2.0)))
 
-(define-public go-golang.org-x-sync-errgroup
-  (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb")
-        (revision "0"))
-    (package
-      (name "go-golang.org-x-sync-errgroup")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://go.googlesource.com/sync")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/sync/errgroup"
-         #:unpack-path "golang.org/x/sync"))
-      (synopsis "Synchronization, error propagation, and Context cancellation
-for groups of goroutines working on subtasks of a common task")
-      (description "This package provides synchronization, error propagation,
-and Context cancellation for groups of goroutines working on subtasks of a
-common task.")
-      (home-page "https://godoc.org/golang.org/x/sync/errgroup")
-      (license license:bsd-3))))
-
-(define-public go-golang.org-x-sync-semaphore
-  (package
-    (inherit go-golang.org-x-sync-errgroup)
-    (name "go-golang.org-x-sync-semaphore")
-    (arguments
-     '(#:import-path "golang.org/x/sync/semaphore"
-       #:unpack-path "golang.org/x/sync"))
-    (synopsis "Weighted semaphore implementation in Go")
-    (description "Weighted semaphore implementation in Go.")
-    (home-page "https://godoc.org/golang.org/x/sync/semaphore")))
-
 (define (go-gotest-tools-source version sha256-base32-hash)
   (origin
     (method git-fetch)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f609de8eff..37223d0d18 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -90,6 +90,7 @@ (define-module (gnu packages terminals)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libcanberra)
-- 
2.41.0

Sharlatan Hellseher wrote on 12 Feb 19:48 +0100

[PATCH v2 07/30] gnu: go-github-com-mreiferson-go-svc: Move to golang-xyz.

Recipients:(address . 69042@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)

Message-ID:041dd3247a9ae6869585b7f81c842cc5e9a49806.1707763691.git.sharlatanus@gmail.com

* gnu/packages/golang.scm (go-github-com-mreiferson-go-svc): Move

from here ...

* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I21f1d5f651fb09a3716cbcdb48aaf7f8dd37384d

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

gnu/packages/golang.scm | 28 ----------------------------

2 files changed, 28 insertions(+), 28 deletions(-)

Toggle diff (80 lines)diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ebcf333b13..aefe0e0d9c 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -170,6 +170,34 @@ (define-public go-github-com-mreiferson-go-options
 command line flags, config files, and default struct values.")
     (license license:expat)))
 
+(define-public go-github-com-mreiferson-go-svc
+  ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
+  ;; does not support go.mod with `replace' statement.
+  (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
+        (revision "0"))
+    (package
+      (name "go-github-com-mreiferson-go-svc")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mreiferson/go-svc")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/judwhite/go-svc"))
+      (propagated-inputs (list go-golang-org-x-sys))
+      (home-page "https://github.com/mreiferson/go-svc")
+      (synopsis "Go Windows Service wrapper for GNU/Linux")
+      (description
+       "Go Windows Service wrapper compatible with GNU/Linux.  Windows tests
+@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
+      (license license:expat))))
+
 (define-public go-github-com-nats-io-nats-go
   (package
     (name "go-github-com-nats-io-nats-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 373b57c5ad..5887d68630 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5484,34 +5484,6 @@ (define-public go-github-com-mr-tron-base58
 encoding and 8 times faster decoding.")
       (license license:expat))))
 
-(define-public go-github-com-mreiferson-go-svc
-  ;; NSQ specific fork of github.com/judwhite/go-svc, as Guix go build system
-  ;; does not support go.mod with `replace' statement.
-  (let ((commit "7a96e00010f68d9436e3de53a70c53f209a0c244")
-        (revision "0"))
-    (package
-      (name "go-github-com-mreiferson-go-svc")
-      (version (git-version "1.2.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/mreiferson/go-svc")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1acgb0n3svhnraqj1fz5qc5n3b4vc5ffwyk9vfi6gcfkibm0hgmd"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "github.com/judwhite/go-svc"))
-      (propagated-inputs (list go-golang-org-x-sys))
-      (home-page "https://github.com/mreiferson/go-svc")
-      (synopsis "Go Windows Service wrapper for GNU/Linux")
-      (description
-       "Go Windows Service wrapper compatible with GNU/Linux.  Windows tests
-@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
-      (license license:expat))))
-
 (define-public go-github-com-spaolacci-murmur3
   (package
     (name "go-github-com-spaolacci-murmur3")
-- 
2.41.0

Sharlatan Hellseher wrote on 13 Feb 15:48 +0100

[PATCH 00/30] Split (gnu packages golang) part IV.

Recipients:(address . 69042-done@debbugs.gnu.org)

Message-ID:87wmr8pghq.fsf@gmail.com

Pushed as 5a77f2ee54..c185c51e14 to master.

Oleg

Closed

Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it

mumi current 69042

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

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date