[PATCH 00/38] Split (gnu packages golang) part III

  • Done
  • quality assurance status badge
Details
2 participants
  • Hilton Chain
  • Sharlatan Hellseher
Owner
unassigned
Submitted by
Sharlatan Hellseher
Severity
normal
S
S
Sharlatan Hellseher wrote on 20 Jan 10:50 +0100
(address . guix-patches@gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cover.1705743627.git.sharlatanus@gmail.com
Hi Guix!

This is part III of the patch series that splits the monolithic (GNU packages
golang) into logical blocks. This time, I have focused on the
cryptography-related scope, which includes Golang modules (libraries) related
to encryption algorithms, hashing functions, TLS, key management, digital
signatures, and password management.

As with parts I and II, all local checks have passed successfully. I have made
sure not to extend the limit of the master branch on affected packages.

Modules which include packages from (gnu packages golang-crypto):
?????
? grep -El $(grep define-public gnu/packages/golang-crypto.scm |cut -d" " -f2 | paste -s -d"\\|" -) gnu/packages/*.scm | sort
?????
gnu/packages/backup.scm gnu/packages/file-systems.scm
gnu/packages/golang-crypto.scm gnu/packages/golang.scm
gnu/packages/golang-web.scm gnu/packages/ipfs.scm
gnu/packages/mail.scm gnu/packages/password-utils.scm
gnu/packages/textutils.scm gnu/packages/uucp.scm
gnu/packages/version-control.scm

Modules which use (gnu packages golang-crypto):
?????
? grep -r -l "golang-crypto" . | grep ".*\.scm" | sort
?????
./gnu/packages/backup.scm ./gnu/packages/file-systems.scm
./gnu/packages/golang-crypto.scm ./gnu/packages/golang.scm
./gnu/packages/golang-web.scm ./gnu/packages/ipfs.scm
./gnu/packages/mail.scm ./gnu/packages/password-utils.scm
./gnu/packages/textutils.scm ./gnu/packages/uucp.scm
./gnu/packages/version-control.scm

Make sure all packages from (gnu packages golang-crypto) are still buildable:
?????
? ./pre-inst-env guix build $(grep define-public gnu/packages/golang-crypto.scm |cut -d" " -f2)
?????
/gnu/store/20w6z4x1sdx0z2dwfllqrni26hxv5myk-go-lukechampine-com-blake3-1.1.5
/gnu/store/xaaxwcjjr5nyajks56ydsiciqij0kif9-go-gitlab-com-yawning-edwards25519-extra-0.0.0-0.2149dca
/gnu/store/5cqgkl2rb62z27f6llsk8k85srrr76hg-go-github-com-xanzy-ssh-agent-0.2.1
/gnu/store/dql4whx3i94p83ma8q9gpsfkapp84bfc-go-github-com-shadowsocks-go-shadowsocks2-0.1.3
/gnu/store/sq3wgyvpl7m4nl3k2fkgq24ysgqbi4vm-go-github-com-riobard-go-bloom-0.0.0-0.cdc8013
/gnu/store/1nb2v8l672y2ysnxw87abh0rshjkjbh6-go-github-com-rfjakob-eme-1.1.2
/gnu/store/yqbrzhv0p2qr9xq6q2jk5xsfzcdvzi4a-go-github-com-refraction-networking-utls-1.6.0
/gnu/store/aaad70fljmgcq770w0wsm0jlifnf1vi4-go-github-com-protonmail-go-crypto-0.0.0-20220623141421-5afb4c282135
/gnu/store/f544q20h8rzdzfg1sij717whywcrpswg-go-github-com-operatorfoundation-ed25519-0.0.0-0.b22b4bd
/gnu/store/fz69mp9dnl808q2l4wvbrd2mv59vfhlk-go-github-com-quic-go-qtls-go1-20-0.3.4
/gnu/store/wa54xggjfp4hl9r5xbvxzlqz71d80j6l-go-github-com-multiformats-go-multihash-1.0.8-0.97cdb56
/gnu/store/ml9myd2mnp3lsw5f0i220dhbkppy9yqf-go-github-com-minio-sha256-simd-0.1.1
/gnu/store/hlnz0p3ifa7r13z6iy090h2rvkgxvzml-go-github-com-minio-blake2b-simd-0.0.0-0.3f5f724
/gnu/store/qnybjzy9piwpf49s4hr33s9q3cf9lmvl-go-github-com-marten-seemann-qtls-0.4.1
/gnu/store/6r589q68il2ijrkqy5q3yw2ywk24fv1g-go-github-com-marten-seemann-chacha20-0.2.0
/gnu/store/axh4f6c1kl0wii1j756m5qcf9hlxa9vh-go-github-com-libp2p-go-libp2p-peer-2.3.8-0.993d742
/gnu/store/ihvcn12yrr0jfqlkjawb19a04v8c5lga-go-github-com-libp2p-go-libp2p-crypto-2.0.1-0.7240b40
/gnu/store/z9halh9na6x8y0h88c8vwlw1ja42090k-go-github-com-jcmturner-aescts-v2-2.0.0
/gnu/store/68ba5vkkqaqf9b8q6cjsdar43pvfb9kh-go-github-com-gxed-hashland-keccakpg-0.0.0-0.d9f6b97
/gnu/store/rhp67dx6ksr117llcypm342b2hwm7p0f-go-github-com-gaukas-godicttls-0.0.4
/gnu/store/92rcmjpchhgs2xpaxd8d0hbdqr64d1qn-go-github-com-flynn-noise-1.0.0
/gnu/store/y780h1h51fr4bs4dwaw4iihgzffkjdsw-go-github-com-emersion-go-pgpmail-0.2.0
/gnu/store/niwvfhwxlj6fysnh1kl1fg3dcvzql65y-go-github-com-dvsekhvalnov-jose2go-1.5.0
/gnu/store/0366llbswq061v2n1j14iyi4h2s55na3-go-github-com-cloudflare-circl-1.3.6
/gnu/store/5p0z1i8y83mla9mpzbk30wxbz45c0qrv-go-github-com-cespare-xxhash-2.1.2
/gnu/store/s2qdkq60hhly6488i9cw1gn90qh78ixb-go-github-com-btcsuite-btcd-btcec-0.12.0-beta-0.67e573d
/gnu/store/knbc42wsq30fshjsxdrahxia4i6yv383-go-github-com-aperturerobotics-jacobsa-crypto-1.0.1-0.b1eb679
/gnu/store/697gzhy2vmlhpi464h826djw09bqjj6x-go-github-com-aead-chacha20-0.0.0-0.8b13a72
/gnu/store/nl6lx7rf4467qqbdfyw14i7wvc44hyk2-go-github-com-99designs-go-keyring-1.2.2
/gnu/store/x33v0vxgflh6z79fxr5pknh6lh9vqywb-go-filippo-io-edwards25519-1.0.0
/gnu/store/fw46ivw7h98scgwj208270dsnm2ixr91-go-filippo-io-age-1.1.1

List all dependent packages and make sure all of them are buildable:
?????
? ./pre-inst-env guix refresh --list-dependent $(grep define-public gnu/packages/golang-crypto.scm |cut -d" " -f2)
?????
Building the following 17 packages would ensure 45 dependent packages
are rebuilt: pass-age@1.7.4a1 ssh-to-age@1.1.2 miniflux@2.0.46
csvdiff@1.4.0 aws-vault@6.6.2 lfs-s3@0.1.5 restic-rest-server@0.11.0
gx@0.14.3 gx-go@1.9.0 yggdrasil@0.5.4 aerc@0.15.2 gocryptfs@2.4.0
bitmask@0.21.11 torbrowser@13.0.8 kubo@0.15.0

Some packages were broken before migration:
• chezmoi
• nncp

?????
? ./pre-inst-env guix build pass-age@1.7.4a1 ssh-to-age@1.1.2 miniflux@2.0.46 csvdiff@1.4.0 aws-vault@6.6.2 lfs-s3@0.1.5 restic-rest-server@0.11.0 gx@0.14.3 gx-go@1.9.0 yggdrasil@0.5.4 aerc@0.15.2 gocryptfs@2.4.0 bitmask@0.21.11 torbrowser@13.0.8 kubo@0.15.0
?????
/gnu/store/gkkkb03m2rkkx7jd7cpz75s87qm2fhr7-kubo-0.15.0
/gnu/store/4znzwjj6z7miciq2d7hshk8hfya6p5k2-torbrowser-13.0.8
/gnu/store/r8a2n23dl217cc6d5fjw2h7r1p1q4cf3-bitmask-0.21.11
/gnu/store/5352aqlp93yfhmrksrhwvpc3yappk7vf-gocryptfs-2.4.0
/gnu/store/ip92lp7wzi6ng3viwfqzgqljnsj5flwf-aerc-0.15.2
/gnu/store/31aj7nkk1ydi63cda2a685ljv8fl5w23-yggdrasil-0.5.4
/gnu/store/8k87ibgz6l6lxhxn2813vp63flz8ckjy-gx-go-1.9.0
/gnu/store/1awkjcim94z7ijvsa0ryxyy2jcb7vizj-gx-0.14.3
/gnu/store/kj8zs2gkw3icr3bj5z36fn91j5nz241s-restic-rest-server-0.11.0
/gnu/store/0xycsp89lb51dsjkr89jjdqk8h3g53pf-lfs-s3-0.1.5
/gnu/store/05qmy85qlmjxaw6mrbjzni9i0g7akf8r-aws-vault-6.6.2
/gnu/store/94wh24xpds8ikwwskkqlbwij40m7rxk5-csvdiff-1.4.0
/gnu/store/pk17npw71d3h3bj741m26wxrvpi6r02r-miniflux-2.0.46
/gnu/store/p5ndp17f73a80yvzpjaxjawi4nfbgm7p-ssh-to-age-1.1.2
/gnu/store/6xlljpyx3yyn417a0ghkx4mxg8a6300a-pass-age-1.7.4a1

Sharlatan Hellseher (38):
gnu: Add (gnu packages golang-crypto) module.
gnu: go-github-com-pquerna-cachecontrol: Move to (gnu packages golang-web).
gnu: go-github-com-multiformats-go-multihash: Move to (gnu packages golang-crypto).
gnu: go-github-com-riobard-go-bloom: Move to (gnu packages golang-crypto).
gnu: go-github-com-libp2p-go-libp2p-crypto: Move to (gnu packages golang-crypto).
gnu: go-github-com-shadowsocks-go-shadowsocks2: Move to (gnu packages golang-crypto).
gnu: go-github-com-libp2p-go-libp2p-peer: Move to (gnu packages golang-crypto).
gnu: go-github-com-aead-chacha20: Move to (gnu packages golang-crypto).
gnu: go-github-com-marten-seemann-chacha20: Move to (gnu packages golang-crypto).
gnu: go-github-com-refraction-networking-utls: Move to (gnu packages golang-crypto).
gnu: go-filippo-io-edwards25519: Move to (gnu packages golang-crypto).
gnu: go-gitlab-com-yawning-edwards25519-extra: Move to (gnu packages golang-crypto).
gnu: go-github-com-marten-seemann-qtls: Move to (gnu packages golang-crypto).
gnu: go-github-com-gaukas-godicttls: Move to (gnu packages golang-crypto).
gnu: go-github-com-quic-go-qtls-go1-20: Move to (gnu packages golang-crypto).
gnu: go-github-com-jcmturner-aescts-v2: Move to (gnu packages golang-crypto).
gnu: go-github-com-aperturerobotics-jacobsa-crypto: Move to (gnu packages golang-crypto).
gnu: go-github-com-rfjakob-eme: Move to (gnu packages golang-crypto).
gnu: go-github-com-emersion-go-pgpmail: Move to (gnu packages golang-crypto).
gnu: go-github-com-protonmail-go-crypto: Move to (gnu packages golang-crypto).
gnu: go-github-com-btcsuite-btcd-btcec: Move to (gnu packages golang-crypto).
gnu: go-lukechampine-com-blake3: Move to (gnu packages golang-crypto).
gnu: go-github-com-cloudflare-circl: Move to (gnu packages golang-crypto).
gnu: go-github-com-minio-sha256-simd: Move to (gnu packages golang-crypto).
gnu: go-github-com-flynn-noise: Move to (gnu packages golang-crypto).
gnu: go-github-com-gxed-hashland-keccakpg: Move to (gnu packages golang-crypto).
gnu: go-github-com-operatorfoundation-ed25519: Move to (gnu packages golang-crypto).
gnu: go-github-com-minio-blake2b-simd: Move to (gnu packages golang-crypto).
gnu: go-github-com-cespare-xxhash: Move to (gnu packages golang-crypto).
gnu: go-github-com-99designs-go-keyring: Move to (gnu packages golang-crypto).
gnu: go-github-com-xanzy-ssh-agent: Move to (gnu packages golang-crypto).
gnu: go-filippo-io-age: Move to (gnu packages golang-crypto).
gnu: go-github-com-dvsekhvalnov-jose2go: Move to (gnu packages golang-crypto).
gnu: go-github.com-smartystreets-gunit: Move to (gnu packages golang-check).
gnu: go-github.com-smartystreets-assertions: Move to (gnu packages golang-check).
gnu: go-github.com-smartystreets-goconvey: Move to (gnu packages golang-check).
gnu: go-github-com-99designs-go-keyring: Adjust inputs.
gnu: go-github-com-quic-go-qtls-go1-20: Sort package alphabetically.

gnu/local.mk | 1 +
gnu/packages/backup.scm | 1 +
gnu/packages/check.scm | 88 ---
gnu/packages/file-systems.scm | 1 +
gnu/packages/golang-check.scm | 88 +++
gnu/packages/golang-crypto.scm | 978 +++++++++++++++++++++++++++++++
gnu/packages/golang-web.scm | 26 +
gnu/packages/golang.scm | 948 +-----------------------------
gnu/packages/ipfs.scm | 1 +
gnu/packages/mail.scm | 1 +
gnu/packages/password-utils.scm | 1 +
gnu/packages/syncthing.scm | 31 -
gnu/packages/textutils.scm | 1 +
gnu/packages/uucp.scm | 1 +
gnu/packages/version-control.scm | 1 +
15 files changed, 1114 insertions(+), 1054 deletions(-)
create mode 100644 gnu/packages/golang-crypto.scm


base-commit: d99670e33e3dcf96a944833d5c2bba35600a06e0
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 01/38] gnu: Add (gnu packages golang-crypto) module.
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cd676e30f234b829cde11b61458a5894f72ded0f.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang-crypto.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-crypto.scm scope.

Change-Id: I92a110f31a74c5a54c59ee2a0f17373915be1b35
---
gnu/local.mk | 1 +
gnu/packages/golang-crypto.scm | 43 ++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
create mode 100644 gnu/packages/golang-crypto.scm

Toggle diff (63 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 34bed91fc3..07481d1de1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -307,6 +307,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
%D%/packages/golang-check.scm \
+ %D%/packages/golang-crypto.scm \
%D%/packages/golang-web.scm \
%D%/packages/gperf.scm \
%D%/packages/gpodder.scm \
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
new file mode 100644
index 0000000000..38ccc5ffe9
--- /dev/null
+++ b/gnu/packages/golang-crypto.scm
@@ -0,0 +1,43 @@
+;;; 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-crypto)
+ #: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)
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check))
+
+;;; Commentary:
+;;;
+;;; Golang modules (libraries) related to Cryptography: encryption algorithms,
+;;; hashing functions, TLS, key management, digital signatures, password
+;;; hashing etc.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 02/38] gnu: go-github-com-pquerna-cachecontrol: Move to (gnu packages golang-web).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
aee3f07e6c3fd66a7a5a20b1b1891a576af243fe.1705743627.git.sharlatanus@gmail.com
* /gnu/packages/golang.scm (go-github-com-pquerna-cachecontrol): Move
from here ...
* /gnu/packages/golang-web.scm: ... to here.

Change-Id: I0f25ffcdf142a3676e0e1fa61408cb9411326fb6
---
gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
2 files changed, 25 insertions(+), 25 deletions(-)

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3e60bfaf33..07b77ee673 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1119,6 +1119,31 @@ (define-public go-github-com-opentracing-opentracing-go
(description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
(license license:asl2.0)))
+(define-public go-github-com-pquerna-cachecontrol
+ (package
+ (name "go-github-com-pquerna-cachecontrol")
+ (version "0.2.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pquerna/cachecontrol")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d5zgv2w0sinh9m41pw3n015zzyabk7awgwwga7nmhjz452c9r5n"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/pquerna/cachecontrol"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/pquerna/cachecontrol")
+ (synopsis "Golang HTTP Cache-Control Parser and Interpretation")
+ (description
+ "This package implements RFC 7234 Hypertext Transfer Protocol (HTTP/1.1):
+Caching.")
+ (license license:asl2.0)))
+
(define-public go-github-com-puerkitobio-goquery
(package
(name "go-github-com-puerkitobio-goquery")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e7306a585c..e51aff3a0f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3891,31 +3891,6 @@ (define-public gopls
editor.")
(license license:bsd-3)))
-(define-public go-github-com-pquerna-cachecontrol
- (package
- (name "go-github-com-pquerna-cachecontrol")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pquerna/cachecontrol")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d5zgv2w0sinh9m41pw3n015zzyabk7awgwwga7nmhjz452c9r5n"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/pquerna/cachecontrol"))
- (native-inputs
- (list go-github-com-stretchr-testify))
- (home-page "https://github.com/pquerna/cachecontrol")
- (synopsis "Golang HTTP Cache-Control Parser and Interpretation")
- (description
- "This package implements RFC 7234 Hypertext Transfer Protocol (HTTP/1.1):
-Caching.")
- (license license:asl2.0)))
-
(define-public go-github-com-protonmail-go-crypto
(package
(name "go-github-com-protonmail-go-crypto")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 04/38] gnu: go-github-com-riobard-go-bloom: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
646b7b698f1aa758bd89a919a63542e2d7f02551.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-riobard-go-bloom): Move from
here ...
* gnu/packages/golang-crypto.go: ... to here.

Change-Id: I5ec63d8d9d90690348f494cb538ec2c4587a7557
---
gnu/packages/golang-crypto.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
2 files changed, 24 insertions(+), 24 deletions(-)

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 96e12a1194..da331ceb3b 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,6 +68,29 @@ (define-public go-github-com-multiformats-go-multihash
(description "Multihash implementation in Go.")
(license license:expat))))
+(define-public go-github-com-riobard-go-bloom
+ (let ((commit "cdc8013cb5b3eb0efebec85f0e904efccac42df9")
+ (revision "0"))
+ (package
+ (name "go-github-com-riobard-go-bloom")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/riobard/go-bloom")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10a8ixh6zw52df2imxrzgxi82zc1j5hqnv5smjp818qwdn1a1rhj"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/riobard/go-bloom"))
+ (home-page "https://github.com/riobard/go-bloom")
+ (synopsis "Bloom filter in Go")
+ (description "Go-Bloom implements bloom filter using double hashing.")
+ (license license:asl2.0))))
+
;;;
;;; 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 7924670675..7cd0a35280 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1859,30 +1859,6 @@ (define-public go-github-com-savsgio-gotils
"Golang utilities to make your life easier with zero allocations.")
(license license:asl2.0))))
-(define-public go-github-com-riobard-go-bloom
- (let ((commit "cdc8013cb5b3eb0efebec85f0e904efccac42df9")
- (revision "0"))
- (package
- (name "go-github-com-riobard-go-bloom")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/riobard/go-bloom")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "10a8ixh6zw52df2imxrzgxi82zc1j5hqnv5smjp818qwdn1a1rhj"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/riobard/go-bloom"))
- (home-page "https://github.com/riobard/go-bloom")
- (synopsis "Bloom filter in Go")
- (description "Go-Bloom implements bloom filter using double hashing.")
- (license license:asl2.0))))
-
(define-public go-github-com-aead-chacha20
(let ((commit "8b13a72661dae6e9e5dea04f344f0dc95ea29547")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 05/38] gnu: go-github-com-libp2p-go-libp2p-crypto: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
55eb1220659b1fef10006cbc060a55c8aec2a25d.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-libp2p-go-libp2p-crypto): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I407bec9b36d61475b2a555643f8bc89b623452e9
---
gnu/packages/golang-crypto.scm | 29 +++++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 29 insertions(+), 28 deletions(-)

Toggle diff (81 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index da331ceb3b..2c9605b8cf 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -38,6 +38,35 @@ (define-module (gnu packages golang-crypto)
;;;
;;; Code:
+(define-public go-github-com-libp2p-go-libp2p-crypto
+ (let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b")
+ (revision "0"))
+ (package
+ (name "go-github-com-libp2p-go-libp2p-crypto")
+ (version (git-version "2.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-libp2p-crypto")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qwpy57qv5143l9dlfwfvpqsxdd2i4zwnawx1w4pmgxxim3nw1wb"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/libp2p/go-libp2p-crypto"))
+ (native-inputs
+ (list go-github-com-btcsuite-btcd-btcec
+ go-github-com-gogo-protobuf
+ go-github-com-minio-sha256-simd
+ go-golang-org-x-crypto))
+ (home-page
+ "https://github.com/libp2p/go-libp2p-crypto")
+ (synopsis "Various cryptographic utilities used by IPFS")
+ (description "Various cryptographic utilities used by IPFS")
+ (license license:expat))))
+
(define-public go-github-com-multiformats-go-multihash
(let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7cd0a35280..2bf6b0a4a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5868,34 +5868,6 @@ (define-public go-github-com-minio-sha256-simd
Architecture Processors\" by J. Guilford et al.")
(license license:asl2.0)))
-(define-public go-github-com-libp2p-go-libp2p-crypto
- (let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b")
- (revision "0"))
- (package
- (name "go-github-com-libp2p-go-libp2p-crypto")
- (version (git-version "2.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libp2p/go-libp2p-crypto")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0qwpy57qv5143l9dlfwfvpqsxdd2i4zwnawx1w4pmgxxim3nw1wb"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/libp2p/go-libp2p-crypto"))
- (native-inputs
- (list go-golang-org-x-crypto go-github-com-btcsuite-btcd-btcec
- go-github-com-gogo-protobuf go-github-com-minio-sha256-simd))
- (home-page
- "https://github.com/libp2p/go-libp2p-crypto")
- (synopsis "Various cryptographic utilities used by IPFS")
- (description "Various cryptographic utilities used by IPFS")
- (license license:expat))))
-
(define-public go-github-com-cloudflare-circl
(package
(name "go-github-com-cloudflare-circl")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 03/38] gnu: go-github-com-multiformats-go-multihash: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
58b904196d8c9fc73e60304657bcd442f649a714.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-multiformats-go-multihash):
Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/ipfs.scm: Add (gnu packages golang-crypto) to used modules.
* gnu/packages/golang.scm: ... as above.

Change-Id: I153be971141cf60390d03bf589c5121d9554cf9a
---
gnu/packages/golang-crypto.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 32 +-------------------------------
gnu/packages/ipfs.scm | 1 +
3 files changed, 33 insertions(+), 31 deletions(-)

Toggle diff (111 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 38ccc5ffe9..96e12a1194 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,6 +37,36 @@ (define-module (gnu packages golang-crypto)
;;;
;;; Code:
+(define-public go-github-com-multiformats-go-multihash
+ (let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
+ (revision "0"))
+ (package
+ (name "go-github-com-multiformats-go-multihash")
+ (version (git-version "1.0.8" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/multiformats/go-multihash")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "02wd9akrwy4y5m0nig9m24p14bjjgb4n1djydrq8cm4yhbvjrrk0"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/multiformats/go-multihash"))
+ (native-inputs
+ (list go-github-com-mr-tron-base58
+ go-github-com-gxed-hashland-keccakpg
+ go-github-com-minio-blake2b-simd
+ go-github-com-minio-sha256-simd
+ go-github-com-spaolacci-murmur3
+ go-golang-org-x-crypto))
+ (home-page "https://github.com/multiformats/go-multihash")
+ (synopsis "Multihash implementation in Go")
+ (description "Multihash implementation in Go.")
+ (license license:expat))))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e51aff3a0f..7924670675 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -81,6 +81,7 @@ (define-module (gnu packages golang)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
@@ -6136,37 +6137,6 @@ (define-public go-github-com-twmb-murmur3
required by Go's standard Hash interface.")
(license license:bsd-3)))
-(define-public go-github-com-multiformats-go-multihash
- (let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
- (revision "0"))
- (package
- (name "go-github-com-multiformats-go-multihash")
- (version (git-version "1.0.8" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/multiformats/go-multihash")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "02wd9akrwy4y5m0nig9m24p14bjjgb4n1djydrq8cm4yhbvjrrk0"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/multiformats/go-multihash"))
- (native-inputs
- (list go-github-com-mr-tron-base58
- go-github-com-gxed-hashland-keccakpg
- go-github-com-minio-blake2b-simd
- go-github-com-minio-sha256-simd
- go-github-com-spaolacci-murmur3
- go-golang-org-x-crypto))
- (home-page "https://github.com/multiformats/go-multihash")
- (synopsis "Multihash implementation in Go")
- (description "Multihash implementation in Go.")
- (license license:expat))))
-
(define-public go-github-com-libp2p-go-libp2p-peer
(let ((commit "993d742bc29dcf4894b7730ba610fd78900be76c")
(revision "0"))
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index fc66582c8a..5aa64a31a8 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages ipfs)
#:use-module (guix build-system go)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 06/38] gnu: go-github-com-shadowsocks-go-shadowsocks2: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ae120d987d2ba906d8d6e44d138e91cc63430fb2.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-shadowsocks-go-shadowsocks2):
Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: Iae18376cae074b6ffb2d5b1b27b6161f4712dfdb
---
gnu/packages/golang-crypto.scm | 29 +++++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
2 files changed, 29 insertions(+), 27 deletions(-)

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 2c9605b8cf..859d490787 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -120,6 +120,35 @@ (define-public go-github-com-riobard-go-bloom
(description "Go-Bloom implements bloom filter using double hashing.")
(license license:asl2.0))))
+(define-public go-github-com-shadowsocks-go-shadowsocks2
+ (package
+ (name "go-github-com-shadowsocks-go-shadowsocks2")
+ ;; Version > 0.1.3 requires go-toolchain v1.16.
+ (version "0.1.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/shadowsocks/go-shadowsocks2")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/shadowsocks/go-shadowsocks2"))
+ (propagated-inputs
+ (list go-github-com-riobard-go-bloom
+ go-golang-org-x-crypto
+ go-golang-org-x-net
+ go-golang-org-x-sys
+ go-golang-org-x-text))
+ (home-page "https://github.com/shadowsocks/go-shadowsocks2")
+ (synopsis "Shadowsocks tunnel proxy")
+ (description "Go-ShadowSocks is a Go implementation of the Shadowsocks
+tunnel proxy protocol.")
+ (license license:asl2.0)))
+
;;;
;;; 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 2bf6b0a4a9..a47345cc1e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1733,33 +1733,6 @@ (define-public go-github-com-rfjakob-eme
mode developed by Halevi and Rogaway.")
(license license:expat)))
-(define-public go-github-com-shadowsocks-go-shadowsocks2
- (package
- (name "go-github-com-shadowsocks-go-shadowsocks2")
- ;; Version > 0.1.3 requires go-toolchain v1.16.
- (version "0.1.3")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/shadowsocks/go-shadowsocks2")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1wzy3ml4ld83iawcl6p313bskzs6zjhz8vlg8kpwgn71cnbv4pvi"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/shadowsocks/go-shadowsocks2"))
- (propagated-inputs
- (list go-github-com-riobard-go-bloom go-golang-org-x-crypto
- go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text))
- (home-page "https://github.com/shadowsocks/go-shadowsocks2")
- (synopsis "Shadowsocks tunnel proxy")
- (description "Go-ShadowSocks is a Go implementation of the Shadowsocks tunnel
-proxy protocol.")
- (license license:asl2.0)))
-
(define-public go-github-com-schachmat-ingo
(package
(name "go-github-com-schachmat-ingo")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:57 +0100
[PATCH 07/38] gnu: go-github-com-libp2p-go-libp2p-peer: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5b2a2356bea964baf55f749e1d27c798a1c9a0d7.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-libp2p-go-libp2p-peer): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I7c372e17f03c9dc18027572582aa8416d59c2cba
---
gnu/packages/golang-crypto.scm | 34 +++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 35 ----------------------------------
2 files changed, 34 insertions(+), 35 deletions(-)

Toggle diff (93 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 859d490787..b2c9c98b44 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -67,6 +67,40 @@ (define-public go-github-com-libp2p-go-libp2p-crypto
(description "Various cryptographic utilities used by IPFS")
(license license:expat))))
+(define-public go-github-com-libp2p-go-libp2p-peer
+ (let ((commit "993d742bc29dcf4894b7730ba610fd78900be76c")
+ (revision "0"))
+ (package
+ (name "go-github-com-libp2p-go-libp2p-peer")
+ (version (git-version "2.3.8" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libp2p/go-libp2p-peer")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h96qjdi0i1wbr0jliap2903mycphas3ny0zdrm77yca9plcnphh"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/libp2p/go-libp2p-peer"))
+ (native-inputs
+ (list go-github-com-btcsuite-btcd-btcec
+ go-github-com-gogo-protobuf
+ go-github-com-gxed-hashland-keccakpg
+ go-github-com-libp2p-go-libp2p-crypto
+ go-github-com-minio-blake2b-simd
+ go-github-com-minio-sha256-simd
+ go-github-com-mr-tron-base58
+ go-github-com-multiformats-go-multihash
+ go-github-com-spaolacci-murmur3
+ go-golang-org-x-crypto))
+ (home-page "https://github.com/libp2p/go-libp2p-peer")
+ (synopsis "PKI based identities for use in go-libp2p")
+ (description "PKI based identities for use in @command{go-libp2p}.")
+ (license license:expat))))
+
(define-public go-github-com-multiformats-go-multihash
(let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a47345cc1e..3abb4a2918 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6058,41 +6058,6 @@ (define-public go-github-com-twmb-murmur3
required by Go's standard Hash interface.")
(license license:bsd-3)))
-(define-public go-github-com-libp2p-go-libp2p-peer
- (let ((commit "993d742bc29dcf4894b7730ba610fd78900be76c")
- (revision "0"))
- (package
- (name "go-github-com-libp2p-go-libp2p-peer")
- (version (git-version "2.3.8" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libp2p/go-libp2p-peer")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1h96qjdi0i1wbr0jliap2903mycphas3ny0zdrm77yca9plcnphh"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/libp2p/go-libp2p-peer"))
- (native-inputs
- (list go-github-com-libp2p-go-libp2p-crypto
- go-github-com-gogo-protobuf
- go-github-com-minio-sha256-simd
- go-github-com-minio-blake2b-simd
- go-github-com-btcsuite-btcd-btcec
- go-github-com-mr-tron-base58
- go-github-com-multiformats-go-multihash
- go-github-com-gxed-hashland-keccakpg
- go-github-com-spaolacci-murmur3
- go-golang-org-x-crypto))
- (home-page "https://github.com/libp2p/go-libp2p-peer")
- (synopsis "PKI based identities for use in go-libp2p")
- (description "PKI based identities for use in @command{go-libp2p}.")
- (license license:expat))))
-
(define-public go-github-com-libp2p-go-libp2p-protocol
(let ((commit "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 08/38] gnu: go-github-com-aead-chacha20: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
eed6a1083cf5a44d0a7476980ef3471ee2cfd49a.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aead-chacha20): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I97254ae17ba12327649d26f154396c42ed07b716
---
gnu/packages/golang-crypto.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 28 ----------------------------
2 files changed, 27 insertions(+), 28 deletions(-)

Toggle diff (79 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index b2c9c98b44..4462eb6141 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -38,6 +38,33 @@ (define-module (gnu packages golang-crypto)
;;;
;;; Code:
+(define-public go-github-com-aead-chacha20
+ (let ((commit "8b13a72661dae6e9e5dea04f344f0dc95ea29547")
+ (revision "0"))
+ (package
+ (name "go-github-com-aead-chacha20")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aead/chacha20")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gbmgq5kbqmbyrsav57ql4jzbvqvp1q7yvcd5fl3wf5g94iyv56r"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/aead/chacha20"))
+ (propagated-inputs
+ (list go-golang-org-x-sys))
+ (home-page "https://github.com/aead/chacha20")
+ (synopsis "ChaCha20 and XChaCha20 stream ciphers")
+ (description "ChaCha is a stream cipher family created by Daniel
+Bernstein. The most common ChaCha variant is ChaCha20 (20 rounds). ChaCha20
+is standardized in RFC 7539.")
+ (license license:expat))))
+
(define-public go-github-com-libp2p-go-libp2p-crypto
(let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3abb4a2918..358edfed63 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1832,34 +1832,6 @@ (define-public go-github-com-savsgio-gotils
"Golang utilities to make your life easier with zero allocations.")
(license license:asl2.0))))
-(define-public go-github-com-aead-chacha20
- (let ((commit "8b13a72661dae6e9e5dea04f344f0dc95ea29547")
- (revision "0"))
- (package
- (name "go-github-com-aead-chacha20")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/aead/chacha20")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0gbmgq5kbqmbyrsav57ql4jzbvqvp1q7yvcd5fl3wf5g94iyv56r"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/aead/chacha20"))
- (propagated-inputs
- (list go-golang-org-x-sys))
- (home-page "https://github.com/aead/chacha20")
- (synopsis "ChaCha20 and XChaCha20 stream ciphers")
- (description "ChaCha is a stream cipher family created by Daniel Bernstein.
-The most common ChaCha variant is ChaCha20 (20 rounds). ChaCha20 is
-standardized in RFC 7539.")
- (license license:expat))))
-
(define-public go-github-com-mufti1-interconv
(let ((commit "d7c72925c6568d60d361757bb9f2d252dcca745c")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 09/38] gnu: go-github-com-marten-seemann-chacha20: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
dafdd2b2b0579ada83a53b1a20cfa1bc552ef7e6.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-marten-seemann-chacha20): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I25bc41e79e119f7a91510d5b7c55466ad7073a5c
---
gnu/packages/golang-crypto.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 22 ----------------------
2 files changed, 23 insertions(+), 22 deletions(-)

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 4462eb6141..93123b547b 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;;
;;; This file is part of GNU Guix.
@@ -128,6 +129,28 @@ (define-public go-github-com-libp2p-go-libp2p-peer
(description "PKI based identities for use in @command{go-libp2p}.")
(license license:expat))))
+(define-public go-github-com-marten-seemann-chacha20
+ (package
+ (name "go-github-com-marten-seemann-chacha20")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/marten-seemann/chacha20")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x1j4cvbap45zk962qkjalc1h3axhzzdy9cdzhcjmprmm1ql4gjm"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/marten-seemann/chacha20"))
+ (home-page "https://github.com/marten-seemann/chacha20")
+ (synopsis "ChaCha20 in Go")
+ (description "This package is an external copy of the Go standard
+library's internal ChaCha20 package.")
+ (license license:bsd-3)))
+
(define-public go-github-com-multiformats-go-multihash
(let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 358edfed63..ab6bba3697 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7126,28 +7126,6 @@ (define-public go-github-com-marten-seemann-qtls
(home-page "https://github.com/marten-seemann/qtls")
(license license:bsd-3)))
-(define-public go-github-com-marten-seemann-chacha20
- (package
- (name "go-github-com-marten-seemann-chacha20")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/marten-seemann/chacha20")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0x1j4cvbap45zk962qkjalc1h3axhzzdy9cdzhcjmprmm1ql4gjm"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/marten-seemann/chacha20"))
- (synopsis "ChaCha20 in Go")
- (description "This package is an external copy of the Go standard library's
-internal ChaCha20 package.")
- (home-page "https://github.com/marten-seemann/chacha20")
- (license license:bsd-3)))
-
(define-public go-github-com-cheekybits-genny
(package
(name "go-github-com-cheekybits-genny")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 10/38] gnu: go-github-com-refraction-networking-utls: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
dae48e6f56959274aea4c190464e500e184557ec.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-refraction-networking-utls):
Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I5d27ca70b36e8fae044e54927caab9ffec23347e
---
gnu/packages/golang-crypto.scm | 37 ++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 36 ---------------------------------
2 files changed, 37 insertions(+), 36 deletions(-)

Toggle diff (104 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 93123b547b..324e65c1ae 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -181,6 +182,42 @@ (define-public go-github-com-multiformats-go-multihash
(description "Multihash implementation in Go.")
(license license:expat))))
+(define-public go-github-com-refraction-networking-utls
+ (package
+ (name "go-github-com-refraction-networking-utls")
+ (version "1.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/refraction-networking/utls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1iywar5vqsml4b177k2nkcxmjm8mw92g3p112yjsrpmikiwpwpyw"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/refraction-networking/utls"
+ #:go ,go-1.20
+ #:tests? #f)) ;requires internet access
+ (propagated-inputs
+ (list go-github-com-andybalholm-brotli
+ go-github-com-cloudflare-circl
+ go-github-com-gaukas-godicttls
+ go-github-com-klauspost-compress
+ go-github-com-quic-go-quic-go
+ go-golang-org-x-crypto
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/refraction-networking/utls")
+ (synopsis "Fork of the Go standard TLS library, providing low-level access
+to the ClientHello for mimicry purposes")
+ (description "uTLS is a fork of “crypto/tls”, which provides ClientHello
+fingerprinting resistance, low-level access to handshake, fake session tickets
+and some other features. Handshake is still performed by “crypto/tls”, this
+library merely changes ClientHello part of it and provides low-level access.")
+ (license license:bsd-3)))
+
(define-public go-github-com-riobard-go-bloom
(let ((commit "cdc8013cb5b3eb0efebec85f0e904efccac42df9")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ab6bba3697..41bc99b146 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3667,42 +3667,6 @@ (define-public go-golang-org-x-crypto
(home-page "https://go.googlesource.com/crypto/")
(license license:bsd-3)))
-(define-public go-github-com-refraction-networking-utls
- (package
- (name "go-github-com-refraction-networking-utls")
- (version "1.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/refraction-networking/utls")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1iywar5vqsml4b177k2nkcxmjm8mw92g3p112yjsrpmikiwpwpyw"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/refraction-networking/utls"
- #:go ,go-1.20
- #:tests? #f)) ;requires internet access
- (propagated-inputs
- (list go-github-com-andybalholm-brotli
- go-github-com-cloudflare-circl
- go-github-com-gaukas-godicttls
- go-github-com-klauspost-compress
- go-github-com-quic-go-quic-go
- go-golang-org-x-crypto
- go-golang-org-x-net
- go-golang-org-x-sys))
- (home-page "https://github.com/refraction-networking/utls")
- (synopsis "Fork of the Go standard TLS library, providing low-level access
-to the ClientHello for mimicry purposes")
- (description "uTLS is a fork of “crypto/tls”, which provides ClientHello
-fingerprinting resistance, low-level access to handshake, fake session tickets
-and some other features. Handshake is still performed by “crypto/tls”, this
-library merely changes ClientHello part of it and provides low-level access.")
- (license license:bsd-3)))
-
(define-public govulncheck
(package
(name "govulncheck")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 11/38] gnu: go-filippo-io-edwards25519: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
9ace3c6f3759c073eda66dbd4fe7ad0173af56df.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-filippo-io-edwards25519): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/password-utils.scm: Add (gnu packages golang-crypto) to
used modules.

Change-Id: I11769b8b212bf4cbe98fe10181c0a2a479c599df
---
gnu/packages/golang-crypto.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
gnu/packages/password-utils.scm | 1 +
3 files changed, 25 insertions(+), 23 deletions(-)

Toggle diff (90 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 324e65c1ae..72771d40a2 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
@@ -40,6 +41,29 @@ (define-module (gnu packages golang-crypto)
;;;
;;; Code:
+(define-public go-filippo-io-edwards25519
+ (package
+ (name "go-filippo-io-edwards25519")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/FiloSottile/edwards25519")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01m8hpaj0cwp250f7b0din09cf8j6j5y631grx67qfhvfrmwr1zr"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "filippo.io/edwards25519"))
+ (home-page "https://filippo.io/edwards25519")
+ (synopsis "Group logic for the twisted Edwards curve")
+ (description "This package implements the edwards25519 elliptic curve in
+Go, exposing the necessary APIs to build a wide array of higher-level
+primitives.")
+ (license license:bsd-3)))
+
(define-public go-github-com-aead-chacha20
(let ((commit "8b13a72661dae6e9e5dea04f344f0dc95ea29547")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 41bc99b146..4e44ebf5ba 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9792,29 +9792,6 @@ (define-public age-keygen
#:unpack-path "filippo.io/age"
#:install-source? #f))))
-(define-public go-filippo-io-edwards25519
- (package
- (name "go-filippo-io-edwards25519")
- (version "1.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/FiloSottile/edwards25519")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "01m8hpaj0cwp250f7b0din09cf8j6j5y631grx67qfhvfrmwr1zr"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "filippo.io/edwards25519"))
- (home-page "https://filippo.io/edwards25519")
- (synopsis "Group logic for the twisted Edwards curve")
- (description
- "This package implements the edwards25519 elliptic curve in Go, exposing
-the necessary APIs to build a wide array of higher-level primitives.")
- (license license:bsd-3)))
-
(define-public go-gitlab-com-yawning-edwards25519-extra
(let ((commit "2149dcafc266f66d2487f45b156f6397f9c4760b")
(revision "0"))
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index bcd323ced8..6dc257dc0e 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-crypto)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages kerberos)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 12/38] gnu: go-gitlab-com-yawning-edwards25519-extra: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4d44875948eae72442c12a9ac23817c116e21a6c.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-gitlab-com-yawning-edwards25519-extra):
Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I9c4aef2a0b58c482f838cc6a3a9e443dc05629b7
---
gnu/packages/golang-crypto.scm | 66 ++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 65 ---------------------------------
2 files changed, 66 insertions(+), 65 deletions(-)

Toggle diff (155 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 72771d40a2..7f25cd12a2 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -294,6 +294,72 @@ (define-public go-github-com-shadowsocks-go-shadowsocks2
tunnel proxy protocol.")
(license license:asl2.0)))
+(define-public go-gitlab-com-yawning-edwards25519-extra
+ (let ((commit "2149dcafc266f66d2487f45b156f6397f9c4760b")
+ (revision "0"))
+ (package
+ (name "go-gitlab-com-yawning-edwards25519-extra")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/yawning/edwards25519-extra")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08mz1qyi8ig515hh5blnzxhiwsav564ah7mzyhvmr6i48ndhhv98"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "gitlab.com/yawning/edwards25519-extra"
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'build
+ (lambda arguments
+ (for-each
+ (lambda (directory)
+ (apply (assoc-ref %standard-phases 'build)
+ `(,@arguments #:import-path ,directory)))
+ (list
+ "gitlab.com/yawning/edwards25519-extra/elligator2"
+ "gitlab.com/yawning/edwards25519-extra/h2c"
+ "gitlab.com/yawning/edwards25519-extra/internal/montgomery"
+ "gitlab.com/yawning/edwards25519-extra/vrf"))))
+ (replace 'check
+ (lambda arguments
+ (for-each
+ (lambda (directory)
+ (apply (assoc-ref %standard-phases 'check)
+ `(,@arguments #:import-path ,directory)))
+ (list
+ "gitlab.com/yawning/edwards25519-extra/elligator2"
+ "gitlab.com/yawning/edwards25519-extra/h2c"
+ "gitlab.com/yawning/edwards25519-extra/internal/montgomery"
+ "gitlab.com/yawning/edwards25519-extra/vrf"))))
+ (replace 'install
+ (lambda arguments
+ (for-each
+ (lambda (directory)
+ (apply (assoc-ref %standard-phases 'install)
+ `(,@arguments #:import-path ,directory)))
+ (list
+ "gitlab.com/yawning/edwards25519-extra/elligator2"
+ "gitlab.com/yawning/edwards25519-extra/h2c"
+ "gitlab.com/yawning/edwards25519-extra/internal/montgomery"
+ "gitlab.com/yawning/edwards25519-extra/vrf")))))))
+ (propagated-inputs (list go-golang-org-x-crypto
+ go-filippo-io-edwards25519))
+ (home-page "https://gitlab.com/yawning/edwards25519-extra")
+ (synopsis "edwards25519-extra")
+ (description "This package provides extensions to the Go standard
+library's Ed25519 and curve25519 implementations, primarily extracted from
+@@url{https://github.com/oasisprotocol/curve25519-voi,curve25519-voi}. This
+package is intended for interoperability with the standard library and the
+@@url{https://filippo.io/edwards25519,edwards25519} package as much as
+possible.")
+ (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 4e44ebf5ba..499bf6c8a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9792,71 +9792,6 @@ (define-public age-keygen
#:unpack-path "filippo.io/age"
#:install-source? #f))))
-(define-public go-gitlab-com-yawning-edwards25519-extra
- (let ((commit "2149dcafc266f66d2487f45b156f6397f9c4760b")
- (revision "0"))
- (package
- (name "go-gitlab-com-yawning-edwards25519-extra")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/yawning/edwards25519-extra")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "08mz1qyi8ig515hh5blnzxhiwsav564ah7mzyhvmr6i48ndhhv98"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "gitlab.com/yawning/edwards25519-extra"
- #:phases
- (modify-phases %standard-phases
- (replace 'build
- (lambda arguments
- (for-each
- (lambda (directory)
- (apply (assoc-ref %standard-phases 'build)
- `(,@arguments #:import-path ,directory)))
- (list
- "gitlab.com/yawning/edwards25519-extra/elligator2"
- "gitlab.com/yawning/edwards25519-extra/h2c"
- "gitlab.com/yawning/edwards25519-extra/internal/montgomery"
- "gitlab.com/yawning/edwards25519-extra/vrf"))))
- (replace 'check
- (lambda arguments
- (for-each
- (lambda (directory)
- (apply (assoc-ref %standard-phases 'check)
- `(,@arguments #:import-path ,directory)))
- (list
- "gitlab.com/yawning/edwards25519-extra/elligator2"
- "gitlab.com/yawning/edwards25519-extra/h2c"
- "gitlab.com/yawning/edwards25519-extra/internal/montgomery"
- "gitlab.com/yawning/edwards25519-extra/vrf"))))
- (replace 'install
- (lambda arguments
- (for-each
- (lambda (directory)
- (apply (assoc-ref %standard-phases 'install)
- `(,@arguments #:import-path ,directory)))
- (list
- "gitlab.com/yawning/edwards25519-extra/elligator2"
- "gitlab.com/yawning/edwards25519-extra/h2c"
- "gitlab.com/yawning/edwards25519-extra/internal/montgomery"
- "gitlab.com/yawning/edwards25519-extra/vrf")))))))
- (propagated-inputs (list go-golang-org-x-crypto
- go-filippo-io-edwards25519))
- (home-page "https://gitlab.com/yawning/edwards25519-extra")
- (synopsis "edwards25519-extra")
- (description
- "This package provides extensions to the Go standard library's Ed25519 and
-curve25519 implementations, primarily extracted from
-@@url{https://github.com/oasisprotocol/curve25519-voi,curve25519-voi}. This
-package is intended for interoperability with the standard library and the
-@@url{https://filippo.io/edwards25519,edwards25519} package as much as possible.")
- (license license:bsd-3))))
-
(define-public go-github-com-bwesterb-go-ristretto
(package
(name "go-github-com-bwesterb-go-ristretto")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 13/38] gnu: go-github-com-marten-seemann-qtls: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4f35359633178d296ed42e29b1d7ae962e450732.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-marten-seemann-qtls): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I036e80323ac61d91743e2c42f878ecad06e6c9b9
---
gnu/packages/golang-crypto.scm | 28 +++++++++++++++++++++++++++-
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 27 insertions(+), 27 deletions(-)

Toggle diff (84 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 7f25cd12a2..36475ce9d4 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
@@ -176,6 +176,32 @@ (define-public go-github-com-marten-seemann-chacha20
library's internal ChaCha20 package.")
(license license:bsd-3)))
+(define-public go-github-com-marten-seemann-qtls
+ (package
+ (name "go-github-com-marten-seemann-qtls")
+ (version "0.4.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/marten-seemann/qtls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dz60y98nm7l70hamq0v2vrs2dspyr5yqhnrds2dfh7hchxvq76j"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/marten-seemann/qtls"
+ ;; The test suite requires networking.
+ #:tests? #f))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (home-page "https://github.com/marten-seemann/qtls")
+ (synopsis "TLS 1.3 with QUIC in Go")
+ (description "This package provides @code{qtls}, a QUIC-capable variant of
+the Go standard library's TLS 1.3 implementation.")
+ (license license:bsd-3)))
+
(define-public go-github-com-multiformats-go-multihash
(let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 499bf6c8a9..7da82299ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7064,32 +7064,6 @@ (define-public go-github-com-burntsushi-locker
mutex, simply ignore the RLock/RUnlock functions.")
(license license:unlicense))))
-(define-public go-github-com-marten-seemann-qtls
- (package
- (name "go-github-com-marten-seemann-qtls")
- (version "0.4.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/marten-seemann/qtls")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0dz60y98nm7l70hamq0v2vrs2dspyr5yqhnrds2dfh7hchxvq76j"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/marten-seemann/qtls"
- ;; The test suite requires networking.
- #:tests? #f))
- (propagated-inputs
- (list go-golang-org-x-crypto))
- (synopsis "TLS 1.3 with QUIC in Go")
- (description "This package provides @code{qtls}, a QUIC-capable variant of
-the Go standard library's TLS 1.3 implementation.")
- (home-page "https://github.com/marten-seemann/qtls")
- (license license:bsd-3)))
-
(define-public go-github-com-cheekybits-genny
(package
(name "go-github-com-cheekybits-genny")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 16/38] gnu: go-github-com-jcmturner-aescts-v2: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1ec5676fb54eccf645f3406f90f2f1974cc10159.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-aescts-v2): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/golang-web.scm: Add (gnu packages golang-crypto) to used
modules.

Change-Id: Ie8f74e09ae50db4e4b0c9292d049cc46c033d6a6
---
gnu/packages/golang-crypto.scm | 25 ++++++++++++++++++++++++-
gnu/packages/golang-web.scm | 1 +
gnu/packages/golang.scm | 24 ------------------------
3 files changed, 25 insertions(+), 25 deletions(-)

Toggle diff (92 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index eac4fc8139..860ee82727 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
-;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;;
@@ -115,6 +115,29 @@ (define-public go-github-com-gaukas-godicttls
for values.")
(license license:bsd-3)))
+(define-public go-github-com-jcmturner-aescts-v2
+ (package
+ (name "go-github-com-jcmturner-aescts-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/aescts")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0yrdiisdhcqfs8jpicc30dfmbqzxhkmbayn902xrgwkndky8w7l1"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/aescts/v2"))
+ (propagated-inputs (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/jcmturner/aescts")
+ (synopsis "Encrypt and decrypt data in Go using AES CipherText Stealing")
+ (description "This package provides AES Cipher Block Chaining CipherText
+Stealing encryption and decryption methods.")
+ (license license:asl2.0)))
+
(define-public go-github-com-libp2p-go-libp2p-crypto
(let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b")
(revision "0"))
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 07b77ee673..dfa1f862dc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages golang-web)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages tls)
#:use-module (gnu packages web))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c1727c0e84..c17dc5b16d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1477,30 +1477,6 @@ (define-public go-github-com-jacobsa-reqtrace
"Package reqtrace contains a very simple request tracing framework.")
(license license:asl2.0))))
-(define-public go-github-com-jcmturner-aescts-v2
- (package
- (name "go-github-com-jcmturner-aescts-v2")
- (version "2.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/aescts")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0yrdiisdhcqfs8jpicc30dfmbqzxhkmbayn902xrgwkndky8w7l1"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/aescts/v2"))
- (propagated-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/jcmturner/aescts")
- (synopsis "Encrypt and decrypt data in Go using AES CipherText Stealing")
- (description
- "This package provides AES Cipher Block Chaining CipherText Stealing
-encryption and decryption methods.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-gofork
(package
(name "go-github-com-jcmturner-gofork")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 17/38] gnu: go-github-com-aperturerobotics-jacobsa-crypto: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
8128a7c1d15c2a1e2c1cbbc5316c4a610808a775.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aperturerobotics-jacobsa-crypto):
Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/file-systems.scm: Add (gnu packages golang-crypto) to
used modules.

Change-Id: I9562a3a3054b7d361758c5e5984891970f191ada
---
gnu/packages/file-systems.scm | 1 +
gnu/packages/golang-crypto.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
3 files changed, 32 insertions(+), 31 deletions(-)

Toggle diff (105 lines)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 8cac1eae9c..4a0976ad84 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 gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages guile)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages kerberos)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 860ee82727..3bcf86673d 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -92,6 +93,36 @@ (define-public go-github-com-aead-chacha20
is standardized in RFC 7539.")
(license license:expat))))
+(define-public go-github-com-aperturerobotics-jacobsa-crypto
+ (let ((commit "b1eb679742a8deed015a4406384eea6bd985d08a")
+ (revision "0"))
+ (package
+ (name "go-github-com-aperturerobotics-jacobsa-crypto")
+ (version (git-version "1.0.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aperturerobotics/jacobsa-crypto")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16dxigj8m6q18xqsy72iq287rh4fw0y0b9yqlw0qkclb8379n1z2"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/aperturerobotics/jacobsa-crypto"
+ ;; Source-only package.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package.
+ (delete 'build))))
+ (home-page "https://github.com/aperturerobotics/jacobsa-crypto")
+ (synopsis "Cryptography missing from the Go standard library")
+ (description "This repository contains Go packages related to
+cryptographic standards that are not included in the Go standard library.")
+ (license license:asl2.0))))
+
(define-public go-github-com-gaukas-godicttls
(package
(name "go-github-com-gaukas-godicttls")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c17dc5b16d..37edfd7eb0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1420,37 +1420,6 @@ (define-public go-github-com-hanwen-go-fuse-v2
"This is a repository containing Go bindings for writing FUSE file systems.")
(license license:bsd-3))))
-(define-public go-github-com-aperturerobotics-jacobsa-crypto
- (let ((commit "b1eb679742a8deed015a4406384eea6bd985d08a")
- (revision "0"))
- (package
- (name "go-github-com-aperturerobotics-jacobsa-crypto")
- (version (git-version "1.0.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aperturerobotics/jacobsa-crypto")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "16dxigj8m6q18xqsy72iq287rh4fw0y0b9yqlw0qkclb8379n1z2"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/aperturerobotics/jacobsa-crypto"
- ;; Source-only package.
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package.
- (delete 'build))))
- (home-page "https://github.com/aperturerobotics/jacobsa-crypto")
- (synopsis "Cryptography missing from the Go standard library")
- (description
- "This repository contains Go packages related to cryptographic standards that are
-not included in the Go standard library.")
- (license license:asl2.0))))
-
(define-public go-github-com-jacobsa-reqtrace
(let ((commit "245c9e0234cb2ad542483a336324e982f1a22934")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 18/38] gnu: go-github-com-rfjakob-eme: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
fed6abf92f25d1a64a5cc36f5db022651eb79ab7.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-rfjakob-eme): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: Ic38d75fd5d3114e246c08abe881fae62e6f9c6b9
---
gnu/packages/golang-crypto.scm | 22 ++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 22 insertions(+), 23 deletions(-)

Toggle diff (69 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 3bcf86673d..3057e803ba 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -373,6 +373,28 @@ (define-public go-github-com-refraction-networking-utls
library merely changes ClientHello part of it and provides low-level access.")
(license license:bsd-3)))
+(define-public go-github-com-rfjakob-eme
+ (package
+ (name "go-github-com-rfjakob-eme")
+ (version "1.1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rfjakob/eme")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1yrbhvy0337mf12fp8p4sy8ry8r3w2qfdf8val5hj07p2lri0cqk"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/rfjakob/eme"))
+ (home-page "https://github.com/rfjakob/eme")
+ (synopsis "EME for Go")
+ (description "EME (ECB-Mix-ECB or, clearer, Encrypt-Mix-Encrypt) is a
+wide-block encryption mode developed by Halevi and Rogaway.")
+ (license license:expat)))
+
(define-public go-github-com-riobard-go-bloom
(let ((commit "cdc8013cb5b3eb0efebec85f0e904efccac42df9")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 37edfd7eb0..c8b211441c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1655,29 +1655,6 @@ (define-public go-github-com-pkg-xattr
.")
(license license:bsd-2)))
-(define-public go-github-com-rfjakob-eme
- (package
- (name "go-github-com-rfjakob-eme")
- (version "1.1.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rfjakob/eme")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1yrbhvy0337mf12fp8p4sy8ry8r3w2qfdf8val5hj07p2lri0cqk"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/rfjakob/eme"))
- (home-page "https://github.com/rfjakob/eme")
- (synopsis "EME for Go")
- (description
- "EME (ECB-Mix-ECB or, clearer, Encrypt-Mix-Encrypt) is a wide-block encryption
-mode developed by Halevi and Rogaway.")
- (license license:expat)))
-
(define-public go-github-com-schachmat-ingo
(package
(name "go-github-com-schachmat-ingo")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 19/38] gnu: go-github-com-emersion-go-pgpmail: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6a914ed6d738a9118dccd2f016242446d774378e.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-emersion-go-pgpmail): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/mail.scm: Add (gnu packages golang-crypto) to used
modules.

Change-Id: I6e5d284bb045acb30881c79258573c6c79ecc512
---
gnu/packages/golang-crypto.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 29 -----------------------------
gnu/packages/mail.scm | 1 +
3 files changed, 32 insertions(+), 29 deletions(-)

Toggle diff (103 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 3057e803ba..d1d6122f95 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
@@ -123,6 +124,36 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto
cryptographic standards that are not included in the Go standard library.")
(license license:asl2.0))))
+(define-public go-github-com-emersion-go-pgpmail
+ (package
+ (name "go-github-com-emersion-go-pgpmail")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/go-pgpmail")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ar26b0apw5bxn58qfn1a79cxigbmrqm1irh1rb7x57fydihc7wm"))))
+ (build-system go-build-system)
+ (arguments
+ (list ;; tests don't support our version of protonmail/go-crypto; see
+ ;; <https://github.com/emersion/go-pgpmail/issues/12>
+ #:tests? #f
+ #:import-path "github.com/emersion/go-pgpmail"))
+ (propagated-inputs
+ (list go-github-com-emersion-go-message
+ go-github-com-protonmail-go-crypto
+ go-golang-org-x-crypto
+ go-golang-org-x-text))
+ (home-page "https://github.com/emersion/go-pgpmail")
+ (synopsis "PGP mail encryption for Go")
+ (description "The pgpmail package implements PGP encryption for e-mail
+messages.")
+ (license license:expat)))
+
(define-public go-github-com-gaukas-godicttls
(package
(name "go-github-com-gaukas-godicttls")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c8b211441c..b8837b4fcd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11748,35 +11748,6 @@ (define-public go-github-com-jhillyerd-enmime
library geared towards parsing MIME encoded emails.")
(license license:expat)))
-(define-public go-github-com-emersion-go-pgpmail
- (package
- (name "go-github-com-emersion-go-pgpmail")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/go-pgpmail")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ar26b0apw5bxn58qfn1a79cxigbmrqm1irh1rb7x57fydihc7wm"))))
- (build-system go-build-system)
- (arguments
- (list ;; tests don't support our version of protonmail/go-crypto; see
- ;; <https://github.com/emersion/go-pgpmail/issues/12>
- #:tests? #f
- #:import-path "github.com/emersion/go-pgpmail"))
- (propagated-inputs (list go-golang-org-x-text
- go-golang-org-x-crypto
- go-github-com-emersion-go-message
- go-github-com-protonmail-go-crypto))
- (home-page "https://github.com/emersion/go-pgpmail")
- (synopsis "PGP mail encryption for Go")
- (description
- "The pgpmail package implements PGP encryption for e-mail messages.")
- (license license:expat)))
-
(define-public go-github-com-gatherstars-com-jwz
(package
(name "go-github-com-gatherstars-com-jwz")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 4466e5e6d9..30ab3b4b76 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -109,6 +109,7 @@ (define-module (gnu packages mail)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 20/38] gnu: go-github-com-protonmail-go-crypto: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
00d725d1621a5cfd5152f6f2be83c737ac88408d.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-protonmail-go-crypto): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I8ab594fcb5b5b7eeec777a177eb7541ed49dba90
---
gnu/packages/golang-crypto.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
2 files changed, 31 insertions(+), 31 deletions(-)

Toggle diff (86 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index d1d6122f95..417dbc34f6 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -368,6 +368,37 @@ (define-public go-github-com-quic-go-qtls-go1-20
QUIC. For Go 1.20.")
(license license:expat)))
+(define-public go-github-com-protonmail-go-crypto
+ (package
+ (name "go-github-com-protonmail-go-crypto")
+ (version "0.0.0-20220623141421-5afb4c282135")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ProtonMail/go-crypto")
+ (commit (go-version->git-ref version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05qxdbn8wdk901z5kw2r3jdrag58nxlcsy0p8xd6rq0d71sw94wy"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/ProtonMail/go-crypto"
+ #:tests? #f ; Source-only package.
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package.
+ (delete 'build))))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (home-page "https://github.com/ProtonMail/go-crypto")
+ (synopsis "Fork of x/crypto with up-to-date OpenPGP implementation")
+ (description "This package provides cryptography for Go. This version of
+the package is a fork that adds a more up-to-date OpenPGP implementation. It
+is completely backwards compatible with @code{golang.org/x/crypto}, the
+official package.")
+ (license license:bsd-3)))
+
(define-public go-github-com-refraction-networking-utls
(package
(name "go-github-com-refraction-networking-utls")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b8837b4fcd..4de3d321ed 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3699,37 +3699,6 @@ (define-public gopls
editor.")
(license license:bsd-3)))
-(define-public go-github-com-protonmail-go-crypto
- (package
- (name "go-github-com-protonmail-go-crypto")
- (version "0.0.0-20220623141421-5afb4c282135")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ProtonMail/go-crypto")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "05qxdbn8wdk901z5kw2r3jdrag58nxlcsy0p8xd6rq0d71sw94wy"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/ProtonMail/go-crypto"
- #:tests? #f ; Source-only package.
- #:phases
- #~(modify-phases %standard-phases
- ;; Source-only package.
- (delete 'build))))
- (propagated-inputs (list go-golang-org-x-crypto))
- (home-page "https://github.com/ProtonMail/go-crypto")
- (synopsis "Fork of x/crypto with up-to-date OpenPGP implementation")
- (description
- "This package provides cryptography for Go. This version of the
-package is a fork that adds a more up-to-date OpenPGP implementation.
-It is completely backwards compatible with @code{golang.org/x/crypto},
-the official package.")
- (license license:bsd-3)))
-
(define-public go-golang-org-x-net
(let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 21/38] gnu: go-github-com-btcsuite-btcd-btcec: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a7be6d8cdc16cf75394a0950675b638c1003e575.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-btcsuite-btcd-btcec): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: Iea48f1ba1edcf9daf567afc3ed1133f0895a0e99
---
gnu/packages/golang-crypto.scm | 38 ++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 38 ----------------------------------
2 files changed, 38 insertions(+), 38 deletions(-)

Toggle diff (106 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 417dbc34f6..91def02194 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
@@ -124,6 +125,43 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto
cryptographic standards that are not included in the Go standard library.")
(license license:asl2.0))))
+(define-public go-github-com-btcsuite-btcd-btcec
+ (let ((commit "67e573d211ace594f1366b4ce9d39726c4b19bd0")
+ (revision "0"))
+ (package
+ (name "go-github-com-btcsuite-btcd-btcec")
+ (version (git-version "0.12.0-beta" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/btcsuite/btcd")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "github.com/btcsuite/btcd"
+ #:import-path "github.com/btcsuite/btcd/btcec"))
+ (native-inputs
+ (list go-github-com-davecgh-go-spew))
+ (home-page "https://github.com/btcsuite/btcd")
+ (synopsis "Elliptic curve cryptography to work with Bitcoin")
+ (description "Package @command{btcec} implements elliptic curve
+cryptography needed for working with Bitcoin (secp256k1 only for now). It is
+designed so that it may be used with the standard crypto/ecdsa packages
+provided with Go. A comprehensive suite of test is provided to ensure proper
+functionality. Package @command{btcec} was originally based on work from
+ThePiachu which is licensed under the same terms as Go, but it has
+significantly diverged since then. The @command{btcsuite} developers original
+is licensed under the liberal ISC license.
+
+Although this package was primarily written for btcd, it has intentionally
+been designed so it can be used as a standalone package for any projects
+needing to use secp256k1 elliptic curve cryptography.")
+ (license license:isc))))
+
(define-public go-github-com-emersion-go-pgpmail
(package
(name "go-github-com-emersion-go-pgpmail")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4de3d321ed..562d1adcfa 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5596,44 +5596,6 @@ (define-public go-github-com-btcsuite-btclog
implementing the same interface.")
(license license:isc))))
-(define-public go-github-com-btcsuite-btcd-btcec
- (let ((commit "67e573d211ace594f1366b4ce9d39726c4b19bd0")
- (revision "0"))
- (package
- (name "go-github-com-btcsuite-btcd-btcec")
- (version (git-version "0.12.0-beta" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/btcsuite/btcd")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "github.com/btcsuite/btcd"
- #:import-path "github.com/btcsuite/btcd/btcec"))
- (native-inputs
- (list go-github-com-davecgh-go-spew))
- (home-page "https://github.com/btcsuite/btcd")
- (synopsis "Elliptic curve cryptography to work with Bitcoin")
- (description "Package @command{btcec} implements elliptic curve
-cryptography needed for working with Bitcoin (secp256k1 only for now). It is
-designed so that it may be used with the standard crypto/ecdsa packages
-provided with Go. A comprehensive suite of test is provided to ensure proper
-functionality. Package @command{btcec} was originally based on work from
-ThePiachu which is licensed under the same terms as Go, but it has
-significantly diverged since then. The @command{btcsuite} developers original
-is licensed under the liberal ISC license.
-
-Although this package was primarily written for btcd, it has intentionally
-been designed so it can be used as a standalone package for any projects
-needing to use secp256k1 elliptic curve cryptography.")
- (license license:isc))))
-
(define-public go-github-com-minio-sha256-simd
(package
(name "go-github-com-minio-sha256-simd")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 22/38] gnu: go-lukechampine-com-blake3: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4badd709db2234f5e723d3941f2fa03f8b515780.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-lukechampine-com-blake3): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/uucp.scm: Add (gnu packages golang-crypto) to used modules.

Change-Id: I56dba8380317a0f58f92140889611ac3075af2cf
---
gnu/packages/golang-crypto.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
gnu/packages/uucp.scm | 1 +
3 files changed, 27 insertions(+), 27 deletions(-)

Toggle diff (96 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 91def02194..bfeea103ca 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
@@ -612,6 +613,31 @@ (define-public go-gitlab-com-yawning-edwards25519-extra
possible.")
(license license:bsd-3))))
+(define-public go-lukechampine-com-blake3
+ (package
+ (name "go-lukechampine-com-blake3")
+ (version "1.1.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/lukechampine/blake3")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1yxdwp8dpnnq2wbwsxlkbq570i99sc6781y39czjxi9jh9z5nw55"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "lukechampine.com/blake3"))
+ (propagated-inputs
+ (list go-github-com-klauspost-cpuid))
+ (home-page "https://pkg.go.dev/lukechampine.com/blake3")
+ (synopsis "Implementation of the BLAKE3 cryptographic hash function")
+ (description "@code{blake3} implements the BLAKE3 cryptographic hash
+function. In addition to the pure-Go implementation, this package also
+contains AVX-512 and AVX2 routines (generated by avo) that greatly increase
+performance for large inputs and outputs.")
+ (license license:expat)))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 562d1adcfa..f6bec6c1c8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10429,33 +10429,6 @@ (define-public go-github-com-dustin-go-humanize
back.")
(license license:expat)))
-(define-public go-lukechampine-com-blake3
- (package
- (name "go-lukechampine-com-blake3")
- (version "1.1.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/lukechampine/blake3")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1yxdwp8dpnnq2wbwsxlkbq570i99sc6781y39czjxi9jh9z5nw55"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "lukechampine.com/blake3"))
- (propagated-inputs
- (list go-github-com-klauspost-cpuid))
- (home-page "https://pkg.go.dev/lukechampine.com/blake3")
- (synopsis "Implementation of the BLAKE3 cryptographic hash function")
- (description "@code{blake3} implements the BLAKE3 cryptographic hash
-function. In addition to the pure-Go implementation, this package also
-contains AVX-512 and AVX2 routines (generated by avo) that greatly increase
-performance for large inputs and outputs.")
- (license license:expat)))
-
(define-public go-golang-org-x-term
(package
(name "go-golang-org-x-term")
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index 1626c90c36..37dc27625a 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-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages texinfo)
#:use-module (guix licenses)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 23/38] gnu: go-github-com-cloudflare-circl: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
febfd4cf7009efb9779b96805ce68e769179fcb6.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-cloudflare-circl): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I6d01b67c795d32387e0b77f1ea53d3a4a8f9939b
---
gnu/packages/golang-crypto.scm | 29 +++++++++++++++++++++++++++++
gnu/packages/golang.scm | 29 -----------------------------
2 files changed, 29 insertions(+), 29 deletions(-)

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index bfeea103ca..23c47712a5 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -163,6 +163,35 @@ (define-public go-github-com-btcsuite-btcd-btcec
needing to use secp256k1 elliptic curve cryptography.")
(license license:isc))))
+(define-public go-github-com-cloudflare-circl
+ (package
+ (name "go-github-com-cloudflare-circl")
+ (version "1.3.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cloudflare/circl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05hk5svprcjrj6k4mg4kd732pnb658llqv04z6xrcl5v77jda2kd"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/cloudflare/circl"))
+ (propagated-inputs
+ (list go-github-com-bwesterb-go-ristretto
+ go-golang-org-x-crypto
+ go-golang-org-x-sys))
+ (home-page "https://blog.cloudflare.com/introducing-circl")
+ (synopsis "Cloudflare Interoperable Reusable Cryptographic Library")
+ (description "CIRCL (Cloudflare Interoperable, Reusable Cryptographic
+Library) is a collection of cryptographic primitives written in Go. The goal
+of this library is to be used as a tool for experimental deployment of
+cryptographic algorithms targeting Post-Quantum (PQ) and Elliptic Curve
+Cryptography (ECC).")
+ (license license:bsd-3)))
+
(define-public go-github-com-emersion-go-pgpmail
(package
(name "go-github-com-emersion-go-pgpmail")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f6bec6c1c8..6eb14a8099 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5630,35 +5630,6 @@ (define-public go-github-com-minio-sha256-simd
Architecture Processors\" by J. Guilford et al.")
(license license:asl2.0)))
-(define-public go-github-com-cloudflare-circl
- (package
- (name "go-github-com-cloudflare-circl")
- (version "1.3.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cloudflare/circl")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "05hk5svprcjrj6k4mg4kd732pnb658llqv04z6xrcl5v77jda2kd"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/cloudflare/circl"))
- (propagated-inputs
- (list go-github-com-bwesterb-go-ristretto
- go-golang-org-x-crypto
- go-golang-org-x-sys))
- (home-page "https://blog.cloudflare.com/introducing-circl")
- (synopsis "Cloudflare Interoperable Reusable Cryptographic Library")
- (description "CIRCL (Cloudflare Interoperable, Reusable Cryptographic
-Library) is a collection of cryptographic primitives written in Go. The goal
-of this library is to be used as a tool for experimental deployment of
-cryptographic algorithms targeting Post-Quantum (PQ) and Elliptic Curve
-Cryptography (ECC).")
- (license license:bsd-3)))
-
(define-public go-github-com-mr-tron-base58
(let ((commit "d724c80ecac7b49e4e562d58b2b4f4ee4ed8c312")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 25/38] gnu: go-github-com-flynn-noise: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6ee878ed799e05b87fe6e4e726d301e1a3d0b754.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-flynn-noise): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: Ie08a20d57424b0ce5fc10ced2a75b29c8aa3fe7d
---
gnu/packages/golang-crypto.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
2 files changed, 26 insertions(+), 27 deletions(-)

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index c57c525a49..9fec753a35 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -223,6 +223,32 @@ (define-public go-github-com-emersion-go-pgpmail
messages.")
(license license:expat)))
+(define-public go-github-com-flynn-noise
+ (package
+ (name "go-github-com-flynn-noise")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/flynn/noise")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1j6phxyqx06wcqxjpin696fkp85s76qcp3i2f7fv6q2fb6618f6y"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/flynn/noise"))
+ (propagated-inputs
+ (list go-gopkg-in-check-v1 go-golang-org-x-crypto))
+ (home-page "https://github.com/flynn/noise")
+ (synopsis "Go implementation of the Noise protocol framework")
+ (description "@code{noise} implements the Noise protocol framework. Noise
+is a low-level framework for building crypto protocols. Noise protocols
+support mutual and optional authentication, identity hiding, forward secrecy,
+zero round-trip encryption, and other advanced features.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gaukas-godicttls
(package
(name "go-github-com-gaukas-godicttls")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0ea028295f..87dd184053 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10390,33 +10390,6 @@ (define-public go-golang-org-x-term
terminals, as commonly found on Unix systems.")
(license license:bsd-3)))
-(define-public go-github-com-flynn-noise
- (package
- (name "go-github-com-flynn-noise")
- (version "1.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/flynn/noise")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1j6phxyqx06wcqxjpin696fkp85s76qcp3i2f7fv6q2fb6618f6y"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/flynn/noise"))
- (propagated-inputs
- (list go-gopkg-in-check-v1 go-golang-org-x-crypto))
- (home-page "https://github.com/flynn/noise")
- (synopsis "Go implementation of the Noise protocol framework")
- (description "@code{noise} implements the Noise protocol framework. Noise
-is a low-level framework for building crypto protocols. Noise protocols
-support mutual and optional authentication, identity hiding, forward secrecy,
-zero round-trip encryption, and other advanced features.")
- (license license:bsd-3)))
-
(define-public go-github-com-klauspost-compress
(package
(name "go-github-com-klauspost-compress")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 24/38] gnu: go-github-com-minio-sha256-simd: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1f8326aa79e9afa499010a7b17616c62aa717b7c.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-minio-sha256-simd): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/backup.scm: Add (gnu packages golang-crypto) to used modules.

Change-Id: I4e57a1bee0c7e19a9bb60ce5ff72ccd5e42deea5
---
gnu/packages/backup.scm | 1 +
gnu/packages/golang-crypto.scm | 34 ++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 34 ----------------------------------
3 files changed, 35 insertions(+), 34 deletions(-)

Toggle diff (110 lines)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 3126464347..f160efd37d 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-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 23c47712a5..c57c525a49 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -379,6 +380,39 @@ (define-public go-github-com-marten-seemann-qtls
the Go standard library's TLS 1.3 implementation.")
(license license:bsd-3)))
+(define-public go-github-com-minio-sha256-simd
+ (package
+ (name "go-github-com-minio-sha256-simd")
+ (version "0.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/minio/sha256-simd")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/minio/sha256-simd"))
+ (home-page "https://github.com/minio/sha256-simd")
+ (synopsis "Accelerate SHA256 computations in pure Go")
+ (description "Accelerate SHA256 computations in pure Go using AVX512 and
+AVX2 for Intel and ARM64 for ARM. On AVX512 it provides an up to 8x
+improvement (over 3 GB/s per core) in comparison to AVX2.
+
+This package is designed as a replacement for @command{crypto/sha256}. For
+Intel CPUs it has two flavors for AVX512 and AVX2 (AVX/SSE are also
+supported). For ARM CPUs with the Cryptography Extensions, advantage is taken
+of the SHA2 instructions resulting in a massive performance improvement.
+
+This package uses Golang assembly. The AVX512 version is based on the Intel's
+\"multi-buffer crypto library for IPSec\" whereas the other Intel
+implementations are described in \"Fast SHA-256 Implementations on Intel
+Architecture Processors\" by J. Guilford et al.")
+ (license license:asl2.0)))
+
(define-public go-github-com-multiformats-go-multihash
(let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6eb14a8099..0ea028295f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5596,40 +5596,6 @@ (define-public go-github-com-btcsuite-btclog
implementing the same interface.")
(license license:isc))))
-(define-public go-github-com-minio-sha256-simd
- (package
- (name "go-github-com-minio-sha256-simd")
- (version "0.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/minio/sha256-simd")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/minio/sha256-simd"))
- (home-page "https://github.com/minio/sha256-simd")
- (synopsis "Accelerate SHA256 computations in pure Go")
- (description "Accelerate SHA256 computations in pure Go using AVX512 and
-AVX2 for Intel and ARM64 for ARM. On AVX512 it provides an up to 8x
-improvement (over 3 GB/s per core) in comparison to AVX2.
-
-This package is designed as a replacement for @command{crypto/sha256}. For
-Intel CPUs it has two flavors for AVX512 and AVX2 (AVX/SSE are also
-supported). For ARM CPUs with the Cryptography Extensions, advantage is taken
-of the SHA2 instructions resulting in a massive performance improvement.
-
-This package uses Golang assembly. The AVX512 version is based on the Intel's
-\"multi-buffer crypto library for IPSec\" whereas the other Intel
-implementations are described in \"Fast SHA-256 Implementations on Intel
-Architecture Processors\" by J. Guilford et al.")
- (license license:asl2.0)))
-
(define-public go-github-com-mr-tron-base58
(let ((commit "d724c80ecac7b49e4e562d58b2b4f4ee4ed8c312")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 26/38] gnu: go-github-com-gxed-hashland-keccakpg: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b12dd7d2d3d6d7b147ee6793c5bc84ff7aec2482.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gxed-hashland-keccakpg): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I000004efa349f0d7548003aeecc98c94669662de
---
gnu/packages/golang-crypto.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 25 insertions(+), 26 deletions(-)

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 9fec753a35..7216f63014 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -272,6 +272,31 @@ (define-public go-github-com-gaukas-godicttls
for values.")
(license license:bsd-3)))
+(define-public go-github-com-gxed-hashland-keccakpg
+ (let ((commit "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8")
+ (revision "0"))
+ (package
+ (name "go-github-com-gxed-hashland-keccakpg")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gxed/hashland")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "github.com/gxed/hashland"
+ #:import-path "github.com/gxed/hashland/keccakpg"))
+ (home-page "https://github.com/gxed/hashland")
+ (synopsis "Implements the Keccak (SHA-3) hash algorithm in Go")
+ (description "Package @command{keccak} implements the Keccak (SHA-3)
+hash algorithm. See http://keccak.noekeon.org.")
+ (license license:expat))))
+
(define-public go-github-com-jcmturner-aescts-v2
(package
(name "go-github-com-jcmturner-aescts-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 87dd184053..f77185b87b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5674,32 +5674,6 @@ (define-public go-github-com-mreiferson-go-svc
@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
(license license:expat))))
-(define-public go-github-com-gxed-hashland-keccakpg
- (let ((commit "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8")
- (revision "0"))
- (package
- (name "go-github-com-gxed-hashland-keccakpg")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gxed/hashland")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "github.com/gxed/hashland"
- #:import-path "github.com/gxed/hashland/keccakpg"))
- (home-page "https://github.com/gxed/hashland")
- (synopsis "Implements the Keccak (SHA-3) hash algorithm in Go")
- (description "Package @command{keccak} implements the Keccak (SHA-3)
-hash algorithm. See http://keccak.noekeon.org.")
- (license license:expat))))
-
(define-public go-github-com-minio-blake2b-simd
(let ((commit "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 14/38] gnu: go-github-com-gaukas-godicttls: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
80cbd7d4d80eccf95ee88d0c5e15780a5f9e8156.1705743627.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gaukas-godicttls): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I19e4a52a213469174ab2a7048abeff6dbf7f715c
---
gnu/packages/golang-crypto.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 23 -----------------------
2 files changed, 23 insertions(+), 23 deletions(-)

Toggle diff (70 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 36475ce9d4..22593aff19 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -91,6 +91,29 @@ (define-public go-github-com-aead-chacha20
is standardized in RFC 7539.")
(license license:expat))))
+(define-public go-github-com-gaukas-godicttls
+ (package
+ (name "go-github-com-gaukas-godicttls")
+ (version "0.0.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gaukas/godicttls")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0n9i0b9nbwq7ms36r34kfc346prrif78hhp55gmbkvlgvsc3m2af"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gaukas/godicttls"))
+ (home-page "https://github.com/gaukas/godicttls")
+ (synopsis "Dictionary for TLS")
+ (description "This package provides a dictionary for TLS written in Go
+providing bidirectional mapping values to their names, plus enum convenience
+for values.")
+ (license license:bsd-3)))
+
(define-public go-github-com-libp2p-go-libp2p-crypto
(let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7da82299ad..784bfe40d7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7115,29 +7115,6 @@ (define-public go-github-com-quic-go-qtls-go1-20
(home-page "https://github.com/quic-go/qtls-go1-20")
(license license:expat)))
-(define-public go-github-com-gaukas-godicttls
- (package
- (name "go-github-com-gaukas-godicttls")
- (version "0.0.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gaukas/godicttls")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0n9i0b9nbwq7ms36r34kfc346prrif78hhp55gmbkvlgvsc3m2af"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gaukas/godicttls"))
- (home-page "https://github.com/gaukas/godicttls")
- (synopsis "dictionary for TLS")
- (description "This package provides a dictionary for TLS written in Go
-providing bidirectional mapping values to their names, plus enum convenience
-for values.")
- (license license:bsd-3)))
-
(define-public go-github-com-quic-go-qpack
(package
(name "go-github-com-quic-go-qpack")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 15/38] gnu: go-github-com-quic-go-qtls-go1-20: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a463b3dd254ea3e64a898ab5facfce103b481742.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-quic-go-qtls-go1-20): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I28127466419cd798c926b62d160c6e512e5171bd
---
gnu/packages/golang-crypto.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
2 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (86 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 22593aff19..eac4fc8139 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
@@ -255,6 +256,33 @@ (define-public go-github-com-multiformats-go-multihash
(description "Multihash implementation in Go.")
(license license:expat))))
+(define-public go-github-com-quic-go-qtls-go1-20
+ (package
+ (name "go-github-com-quic-go-qtls-go1-20")
+ (version "0.3.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/quic-go/qtls-go1-20")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/quic-go/qtls-go1-20"
+ #:go go-1.20))
+ (propagated-inputs
+ (list go-golang-org-x-crypto
+ go-golang-org-x-sys))
+ (home-page "https://github.com/quic-go/qtls-go1-20")
+ (synopsis "TLS 1.3 for QUIC")
+ (description "Go standard library TLS 1.3 implementation, modified for
+QUIC. For Go 1.20.")
+ (license license:expat)))
+
(define-public go-github-com-refraction-networking-utls
(package
(name "go-github-com-refraction-networking-utls")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 784bfe40d7..c1727c0e84 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7088,33 +7088,6 @@ (define-public go-github-com-cheekybits-genny
(home-page "https://github.com/cheekybits/genny/")
(license license:expat)))
-(define-public go-github-com-quic-go-qtls-go1-20
- (package
- (name "go-github-com-quic-go-qtls-go1-20")
- (version "0.3.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/quic-go/qtls-go1-20")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/quic-go/qtls-go1-20"
- #:go go-1.20))
- (propagated-inputs (list go-golang-org-x-crypto
- go-golang-org-x-sys))
- (synopsis "TLS 1.3 for QUIC")
- (description
- "Go standard library TLS 1.3 implementation, modified for QUIC. For
-Go 1.20.")
- (home-page "https://github.com/quic-go/qtls-go1-20")
- (license license:expat)))
-
(define-public go-github-com-quic-go-qpack
(package
(name "go-github-com-quic-go-qpack")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 28/38] gnu: go-github-com-minio-blake2b-simd: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
fda37c28510f98b48e67a67674b0fcf56d261576.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-minio-blake2b-simd): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I096cf86c48b0fdcbf7c5d0b454d45de12018c908
---
gnu/packages/golang-crypto.scm | 31 +++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 32 --------------------------------
2 files changed, 31 insertions(+), 32 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 2b2e9d877f..00a6f51313 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -432,6 +432,37 @@ (define-public go-github-com-marten-seemann-qtls
the Go standard library's TLS 1.3 implementation.")
(license license:bsd-3)))
+(define-public go-github-com-minio-blake2b-simd
+ (let ((commit "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4")
+ (revision "0"))
+ (package
+ (name "go-github-com-minio-blake2b-simd")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/minio/blake2b-simd")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/minio/blake2b-simd"))
+ (home-page "https://github.com/minio/blake2b-simd")
+ (synopsis "Fast hashing in pure Go of BLAKE2b with SIMD instructions")
+ (description "This package was initially based on the pure go BLAKE2b
+implementation of Dmitry Chestnykh and merged with the (cgo dependent) AVX
+optimized BLAKE2 implementation (which in turn is based on the official
+implementation. It does so by using Go's Assembler for amd64 architectures
+with a golang only fallback for other architectures.
+
+In addition to AVX there is also support for AVX2 as well as SSE. Best
+performance is obtained with AVX2 which gives roughly a 4X performance
+increase approaching hashing speeds of 1GB/sec on a single core.")
+ (license license:asl2.0))))
+
(define-public go-github-com-minio-sha256-simd
(package
(name "go-github-com-minio-sha256-simd")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 581594a1e0..ef20bc067e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5674,38 +5674,6 @@ (define-public go-github-com-mreiferson-go-svc
@url{https://github.com/judwhite/go-svc/raw/master/svc/svc_windows_test.go,here}.")
(license license:expat))))
-(define-public go-github-com-minio-blake2b-simd
- (let ((commit "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4")
- (revision "0"))
- (package
- (name "go-github-com-minio-blake2b-simd")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/minio/blake2b-simd")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/minio/blake2b-simd"))
- (home-page "https://github.com/minio/blake2b-simd")
- (synopsis "Fast hashing in pure Go of BLAKE2b with SIMD instructions")
- (description "This package was initially based on the pure go BLAKE2b
-implementation of Dmitry Chestnykh and merged with the (cgo dependent) AVX
-optimized BLAKE2 implementation (which in turn is based on the official
-implementation. It does so by using Go's Assembler for amd64 architectures
-with a golang only fallback for other architectures.
-
-In addition to AVX there is also support for AVX2 as well as SSE. Best
-performance is obtained with AVX2 which gives roughly a 4X performance
-increase approaching hashing speeds of 1GB/sec on a single core.")
- (license license:asl2.0))))
-
(define-public go-github-com-spaolacci-murmur3
(package
(name "go-github-com-spaolacci-murmur3")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 29/38] gnu: go-github-com-cespare-xxhash: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
042d6a994d0f217975f58fd24d338605c88cc042.1705743628.git.sharlatanus@gmail.com
* gnu/packages/syncthing.scm (go-github-com-cespare-xxhash): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

* gnu/packages/textutils.scm: Add (gnu packages golang-crypto) to used
modules.

Change-Id: Ic72cf6c4770cd3f03cc2e27c3455632ee16e7c09
---
gnu/packages/golang-crypto.scm | 32 ++++++++++++++++++++++++++++++++
gnu/packages/syncthing.scm | 31 -------------------------------
gnu/packages/textutils.scm | 1 +
3 files changed, 33 insertions(+), 31 deletions(-)

Toggle diff (103 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 00a6f51313..187f47b8eb 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
@@ -165,6 +166,37 @@ (define-public go-github-com-btcsuite-btcd-btcec
needing to use secp256k1 elliptic curve cryptography.")
(license license:isc))))
+(define-public go-github-com-cespare-xxhash
+ (package
+ (name "go-github-com-cespare-xxhash")
+ (version "2.1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cespare/xxhash")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/cespare/xxhash"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; The tests fail when run with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (home-page "https://github.com/cespare/xxhash/")
+ (synopsis "Go implementation of xxHash")
+ (description "This package provides of Go implementation of the 64-bit
+xxHash algorithm (XXH64).")
+ (license license:expat)))
+
(define-public go-github-com-cloudflare-circl
(package
(name "go-github-com-cloudflare-circl")
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 7598b46824..e3c0593aee 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -1006,34 +1006,3 @@ (define-public go-github-com-ccding-go-stun
and RFC 5389).")
(home-page "https://github.com/ccding/go-stun")
(license asl2.0))))
-
-(define-public go-github-com-cespare-xxhash
- (package
- (name "go-github-com-cespare-xxhash")
- (version "2.1.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cespare/xxhash")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/cespare/xxhash"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; The tests fail when run with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (synopsis "Go implementation of xxHash")
- (description "This package provides of Go implementation of the 64-bit
-xxHash algorithm (XXH64).")
- (home-page "https://github.com/cespare/xxhash/")
- (license expat)))
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 494e6b5ef5..96bc2e56cc 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages textutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages gettext)
#:use-module (gnu packages java)
#:use-module (gnu packages ncurses)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 30/38] gnu: go-github-com-99designs-go-keyring: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3e74a15401324cf2a4fd26a7e73920b7fb44181d.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-99designs-go-keyring): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I7615759c4cdb66a37b492f11d736b1ccfa6b21f2
---
gnu/packages/golang-crypto.scm | 42 ++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 40 --------------------------------
2 files changed, 42 insertions(+), 40 deletions(-)

Toggle diff (120 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 187f47b8eb..9ebe8c70a3 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
@@ -12,6 +13,7 @@
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -72,6 +74,46 @@ (define-public go-filippo-io-edwards25519
primitives.")
(license license:bsd-3)))
+(define-public go-github-com-99designs-go-keyring
+ (package
+ (name "go-github-com-99designs-go-keyring")
+ (version "1.2.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/99designs/keyring")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
+ (build-system go-build-system)
+ (native-inputs
+ (list gnupg
+ go-github-com-dvsekhvalnov-jose2go
+ go-github-com-godbus-dbus
+ go-github-com-gsterjov-go-libsecret
+ go-github-com-mitchellh-go-homedir
+ go-github-com-mtibben-percent
+ go-golang-org-x-sys
+ go-golang-org-x-term
+ password-store))
+ (arguments
+ '(#:import-path "github.com/99designs/keyring"
+ #:tests? #f)) ;XXX: tests require Vagrant
+ (synopsis "Go library providing a uniform interface for various secure
+credential stores")
+ (description
+ "Keyring provides utility functions for and a common interface to a range
+of secure credential storage services. Originally developed as part of AWS
+Vault, a command line tool for securely managing AWS access from developer
+workstations.
+
+Currently Keyring supports the following backends: macOS/OSX Keychain, Windows
+pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.")
+ (home-page "https://github.com/99designs/keyring")
+ (license license:expat)))
+
(define-public go-github-com-aead-chacha20
(let ((commit "8b13a72661dae6e9e5dea04f344f0dc95ea29547")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ef20bc067e..9d3257e176 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10812,46 +10812,6 @@ (define-public go-github-com-gsterjov-go-libsecret
(define-public go-github-com-go-libsecret
(deprecated-package "go-github-com-go-libsecret" go-github-com-gsterjov-go-libsecret))
-(define-public go-github-com-99designs-go-keyring
- (package
- (name "go-github-com-99designs-go-keyring")
- (version "1.2.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/99designs/keyring")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
- (build-system go-build-system)
- (native-inputs
- (list go-golang-org-x-sys
- go-golang-org-x-term
- go-github-com-mtibben-percent
- go-github-com-mitchellh-go-homedir
- go-github-com-dvsekhvalnov-jose2go
- go-github-com-godbus-dbus
- go-github-com-gsterjov-go-libsecret
- password-store
- gnupg))
- (arguments
- '(#:import-path "github.com/99designs/keyring"
- #:tests? #f)) ;XXX: tests require Vagrant
- (synopsis "Go library providing a uniform interface for various secure
-credential stores")
- (description
- "Keyring provides utility functions for and a common interface to a range
-of secure credential storage services. Originally developed as part of AWS
-Vault, a command line tool for securely managing AWS access from developer
-workstations.
-
-Currently Keyring supports the following backends: macOS/OSX Keychain, Windows
-pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.")
- (home-page "https://github.com/99designs/keyring")
- (license license:expat)))
-
(define-public go-github-com-mtibben-androiddnsfix
(let ((commit "ff02804463540c36e3a148dcf4b009d003cf2a31")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 34/38] gnu: go-github.com-smartystreets-gunit: Move to (gnu packages golang-check).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
35531bcce9de92fcbac3300cb950d9abf58521af.1705743628.git.sharlatanus@gmail.com
* gnu/packages/check.scm (go-github.com-smartystreets-gunit): Move from
here ...
* gnu/packages/golang-check.scm: ... to here.

Change-Id: I7204e118f99064027f0e10838d2b44fee212d21d
---
gnu/packages/check.scm | 30 ------------------------------
gnu/packages/golang-check.scm | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 30 deletions(-)

Toggle diff (89 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4de5b1c0d4..0b7acaddad 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -898,36 +898,6 @@ (define-public python-gixy
command.")
(license license:mpl2.0))))
-(define-public go-github.com-smartystreets-gunit
- (package
- (name "go-github.com-smartystreets-gunit")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/smartystreets/gunit")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "00m4zg0kdj49mnpmf9klb44ba71p966xsk6zknrzqgfc8119f35z"))))
- (build-system go-build-system)
- (arguments
- '(;; TODO: This package depends on go-github.com-smartystreets-assertions
- ;; for running the tests, but go-github.com-smartystreets-assertions
- ;; depends on this package, so break this loop by not running the tests
- ;; for this package.
- #:tests? #f
- #:import-path "github.com/smartystreets/gunit"))
- (synopsis "Testing tool for Go, in the style of xUnit")
- (description
- "@code{gunit} allows the test author to use a struct as the scope for a
-group of related test cases, in the style of xUnit fixtures. This makes
-extraction of setup/teardown behavior (as well as invoking the system under
-test) much simpler.")
- (home-page "https://github.com/smartystreets/gunit")
- (license license:expat)))
-
(define-public go-github.com-smartystreets-assertions
(package
(name "go-github.com-smartystreets-assertions")
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index ec886985d6..207e4a548f 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
@@ -378,6 +379,35 @@ (define-public go-github-com-onsi-ginkgo
Gomega matcher library.")
(license license:expat)))
+(define-public go-github.com-smartystreets-gunit
+ (package
+ (name "go-github.com-smartystreets-gunit")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/smartystreets/gunit")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00m4zg0kdj49mnpmf9klb44ba71p966xsk6zknrzqgfc8119f35z"))))
+ (build-system go-build-system)
+ (arguments
+ '(;; TODO: This package depends on go-github.com-smartystreets-assertions
+ ;; for running the tests, but go-github.com-smartystreets-assertions
+ ;; depends on this package, so break this loop by not running the tests
+ ;; for this package.
+ #:tests? #f
+ #:import-path "github.com/smartystreets/gunit"))
+ (home-page "https://github.com/smartystreets/gunit")
+ (synopsis "Testing tool for Go, in the style of xUnit")
+ (description "@code{gunit} allows the test author to use a struct as the
+scope for a group of related test cases, in the style of xUnit fixtures. This
+makes extraction of setup/teardown behavior (as well as invoking the system
+under test) much simpler.")
+ (license license:expat)))
+
(define-public go-github-com-stretchr-testify
(package
(name "go-github-com-stretchr-testify")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 27/38] gnu: go-github-com-operatorfoundation-ed25519: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5459c34bee0624167e30fd0741b913e68090a144.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-operatorfoundation-ed25519):
Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: Ia6a28bb8ad138b921e386f3b4d2dee65b43806d1
---
gnu/packages/golang-crypto.scm | 32 ++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 31 -------------------------------
2 files changed, 32 insertions(+), 31 deletions(-)

Toggle diff (94 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 7216f63014..2b2e9d877f 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
@@ -521,6 +522,37 @@ (define-public go-github-com-quic-go-qtls-go1-20
QUIC. For Go 1.20.")
(license license:expat)))
+(define-public go-github-com-operatorfoundation-ed25519
+ (let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4")
+ (revision "0"))
+ (package
+ (name "go-github-com-operatorfoundation-ed25519")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OperatorFoundation/ed25519")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xrzqrjlghkgd1cy5rj4khryn4f59vas2vzrxc6d8jpj5ijf3xkv"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/OperatorFoundation/ed25519"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'remove-test-data
+ (lambda* (#:key import-path #:allow-other-keys)
+ (delete-file-recursively
+ (string-append "src/" import-path "/testdata"))
+ #t)))))
+ (home-page "https://github.com/OperatorFoundation/ed25519")
+ (synopsis "Ed25519 for go")
+ (description "Package ed25519 implements the Ed25519 signature
+algorithm.")
+ (license license:bsd-3))))
+
(define-public go-github-com-protonmail-go-crypto
(package
(name "go-github-com-protonmail-go-crypto")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f77185b87b..581594a1e0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9850,37 +9850,6 @@ (define-public go-github-com-songmu-gitconfig
(description "@{gitconfig} is a package to get configuration values from gitconfig.")
(license license:expat)))
-(define-public go-github-com-operatorfoundation-ed25519
- (let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4")
- (revision "0"))
- (package
- (name "go-github-com-operatorfoundation-ed25519")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/OperatorFoundation/ed25519")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xrzqrjlghkgd1cy5rj4khryn4f59vas2vzrxc6d8jpj5ijf3xkv"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/OperatorFoundation/ed25519"
- #:phases
- (modify-phases %standard-phases
- (add-before 'install 'remove-test-data
- (lambda* (#:key import-path #:allow-other-keys)
- (delete-file-recursively
- (string-append "src/" import-path "/testdata"))
- #t)))))
- (home-page "https://github.com/OperatorFoundation/ed25519")
- (synopsis "Ed25519 for go")
- (description "Package ed25519 implements the Ed25519 signature
-algorithm.")
- (license license:bsd-3))))
-
(define-public go-github-com-akosmarton-papipes
(let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 31/38] gnu: go-github-com-xanzy-ssh-agent: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
17ceff0663116d7921ed2eeb66455bb9013ea0c0.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xanzy-ssh-agent): Move from
here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I9eff26086b2b5e9e53e9271a64060f18b6197b3c
---
gnu/packages/golang-crypto.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
gnu/packages/version-control.scm | 1 +
3 files changed, 29 insertions(+), 26 deletions(-)

Toggle diff (101 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 9ebe8c70a3..9c9e3d26b8 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -3,10 +3,12 @@
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2021 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
@@ -799,6 +801,32 @@ (define-public go-github-com-shadowsocks-go-shadowsocks2
tunnel proxy protocol.")
(license license:asl2.0)))
+(define-public go-github-com-xanzy-ssh-agent
+ (package
+ (name "go-github-com-xanzy-ssh-agent")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xanzy/ssh-agent")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/xanzy/ssh-agent"))
+ (native-inputs
+ (list go-golang-org-x-crypto))
+ (home-page "https://github.com/xanzy/ssh-agent/")
+ (synopsis "Control ssh-agent from Go")
+ (description "Package agent implements the ssh-agent protocol, and
+provides both a client and a server. The client can talk to a standard
+ssh-agent that uses UNIX sockets, and one could implement an alternative
+ssh-agent process using the sample server.")
+ (license license:asl2.0)))
+
(define-public go-gitlab-com-yawning-edwards25519-extra
(let ((commit "2149dcafc266f66d2487f45b156f6397f9c4760b")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9d3257e176..d79b351498 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8879,32 +8879,6 @@ (define-public go-github-com-kevinburke-ssh-config
can manipulate a @file{ssh_config} file from a program.")
(license license:expat)))
-(define-public go-github-com-xanzy-ssh-agent
- (package
- (name "go-github-com-xanzy-ssh-agent")
- (version "0.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xanzy/ssh-agent")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/xanzy/ssh-agent"))
- (native-inputs
- (list go-golang-org-x-crypto))
- (home-page "https://github.com/xanzy/ssh-agent/")
- (synopsis "Control ssh-agent from Go")
- (description "Package agent implements the ssh-agent protocol, and
-provides both a client and a server. The client can talk to a standard
-ssh-agent that uses UNIX sockets, and one could implement an alternative
-ssh-agent process using the sample server.")
- (license license:asl2.0)))
-
(define-public go-github-com-alcortesm-tgz
(let ((commit "9c5fe88206d7765837fed3732a42ef88fc51f1a1")
(revision "1"))
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index a7a701629f..3949d94a3b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -107,6 +107,7 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-crypto)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 35/38] gnu: go-github.com-smartystreets-assertions: Move to (gnu packages golang-check).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
44d3faded15eecfc9662007bc7ccca9f959c64d0.1705743628.git.sharlatanus@gmail.com
* gnu/packages/check.scm (go-github.com-smartystreets-assertions): Move
from here ...
* gnu/packages/golang-check.scm: ... to here.

Change-Id: Ia90bbe984fe19dd48d9df91364a7ecf2bf8bd37f
---
gnu/packages/check.scm | 33 ---------------------------------
gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 33 deletions(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 0b7acaddad..5e82a09126 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -898,39 +898,6 @@ (define-public python-gixy
command.")
(license license:mpl2.0))))
-(define-public go-github.com-smartystreets-assertions
- (package
- (name "go-github.com-smartystreets-assertions")
- (version "1.13.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/smartystreets/assertions")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/smartystreets/assertions"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; The tests fail when run with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (native-inputs
- (list go-github.com-smartystreets-gunit))
- (synopsis "Assertions for testing with Go")
- (description
- "The @code{assertions} package provides convenient assertion functions
-for writing tests in Go.")
- (home-page "https://github.com/smartystreets/assertions")
- (license license:expat)))
-
(define-public go-github.com-smartystreets-goconvey
(package
(name "go-github.com-smartystreets-goconvey")
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 207e4a548f..0c37849806 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -379,6 +380,38 @@ (define-public go-github-com-onsi-ginkgo
Gomega matcher library.")
(license license:expat)))
+(define-public go-github.com-smartystreets-assertions
+ (package
+ (name "go-github.com-smartystreets-assertions")
+ (version "1.13.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/smartystreets/assertions")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256 (base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/smartystreets/assertions"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; The tests fail when run with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (native-inputs
+ (list go-github.com-smartystreets-gunit))
+ (home-page "https://github.com/smartystreets/assertions")
+ (synopsis "Assertions for testing with Go")
+ (description "The @code{assertions} package provides convenient assertion
+functions for writing tests in Go.")
+ (license license:expat)))
+
(define-public go-github.com-smartystreets-gunit
(package
(name "go-github.com-smartystreets-gunit")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 36/38] gnu: go-github.com-smartystreets-goconvey: Move to (gnu packages golang-check).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
caffdc85c15deae6f5fbe2c13a4bec581e5b9829.1705743628.git.sharlatanus@gmail.com
* gnu/packages/check.scm (go-github.com-smartystreets-goconvey): Move
from here ...
* gnu/packages/golang-check.scm: ... to here.

Change-Id: I19d8db6e3b07e1d165396c0498e328b70b2cc760
---
gnu/packages/check.scm | 25 -------------------------
gnu/packages/golang-check.scm | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 25 deletions(-)

Toggle diff (74 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 5e82a09126..ba99501972 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -898,31 +898,6 @@ (define-public python-gixy
command.")
(license license:mpl2.0))))
-(define-public go-github.com-smartystreets-goconvey
- (package
- (name "go-github.com-smartystreets-goconvey")
- (version "1.6.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/smartystreets/goconvey")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/smartystreets/goconvey"))
- (propagated-inputs
- (list go-github.com-jtolds-gls go-github.com-smartystreets-assertions))
- (synopsis "Go testing tool with both a web and terminal user interface")
- (description
- "GoConvey is a testing tool for Go. It integrates with go test, can show
-test coverage and has a web user interface that will refresh automatically.")
- (home-page "https://github.com/smartystreets/goconvey")
- (license license:expat)))
-
(define-public googletest
(package
(name "googletest")
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 0c37849806..c7b6e94791 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -412,6 +412,31 @@ (define-public go-github.com-smartystreets-assertions
functions for writing tests in Go.")
(license license:expat)))
+(define-public go-github.com-smartystreets-goconvey
+ (package
+ (name "go-github.com-smartystreets-goconvey")
+ (version "1.6.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/smartystreets/goconvey")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/smartystreets/goconvey"))
+ (propagated-inputs
+ (list go-github.com-jtolds-gls go-github.com-smartystreets-assertions))
+ (home-page "https://github.com/smartystreets/goconvey")
+ (synopsis "Go testing tool with both a web and terminal user interface")
+ (description "GoConvey is a testing tool for Go. It integrates with go
+test, can show test coverage and has a web user interface that will refresh
+automatically.")
+ (license license:expat)))
+
(define-public go-github.com-smartystreets-gunit
(package
(name "go-github.com-smartystreets-gunit")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 37/38] gnu: go-github-com-99designs-go-keyring: Adjust inputs.
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6f7b7569c15e170cf49da573fc962f60afaa05e0.1705743628.git.sharlatanus@gmail.com
This package does not use GPG or password-store internally and is only
used as a dependency for aws-vault.

* gnu/packages/golang-crypto.scm (go-github-com-99designs-go-keyring):
Swap native-inputs to propagated-inputs.
[propagated-inputs]: Remove gnupg and password-store.

Change-Id: If5f57f656402058960df416bad25a76fa1b70718
---
gnu/packages/golang-crypto.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index a316a89a18..b4c3ecdecd 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -120,16 +120,14 @@ (define-public go-github-com-99designs-go-keyring
(sha256
(base32 "0mkvy7scyq07rkqhabfmkd8imcm4h9y7zj9palj04znpihpixa5m"))))
(build-system go-build-system)
- (native-inputs
- (list gnupg
- go-github-com-dvsekhvalnov-jose2go
+ (propagated-inputs
+ (list go-github-com-dvsekhvalnov-jose2go
go-github-com-godbus-dbus
go-github-com-gsterjov-go-libsecret
go-github-com-mitchellh-go-homedir
go-github-com-mtibben-percent
go-golang-org-x-sys
- go-golang-org-x-term
- password-store))
+ go-golang-org-x-term))
(arguments
'(#:import-path "github.com/99designs/keyring"
#:tests? #f)) ;XXX: tests require Vagrant
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 38/38] gnu: go-github-com-quic-go-qtls-go1-20: Sort package alphabetically.
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
819b28907a4a95e9711782162c65fc946ecd2dc6.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang-crypto.scm (go-github-com-quic-go-qtls-go1-20):
Sort package alphabeticaly to consist the style.

Change-Id: Ib9d1e037dc1172b33a80dc4b40c785b53a2a0586
---
gnu/packages/golang-crypto.scm | 54 +++++++++++++++++-----------------
1 file changed, 27 insertions(+), 27 deletions(-)

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index b4c3ecdecd..80e87e3f00 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -655,33 +655,6 @@ (define-public go-github-com-multiformats-go-multihash
(description "Multihash implementation in Go.")
(license license:expat))))
-(define-public go-github-com-quic-go-qtls-go1-20
- (package
- (name "go-github-com-quic-go-qtls-go1-20")
- (version "0.3.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/quic-go/qtls-go1-20")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/quic-go/qtls-go1-20"
- #:go go-1.20))
- (propagated-inputs
- (list go-golang-org-x-crypto
- go-golang-org-x-sys))
- (home-page "https://github.com/quic-go/qtls-go1-20")
- (synopsis "TLS 1.3 for QUIC")
- (description "Go standard library TLS 1.3 implementation, modified for
-QUIC. For Go 1.20.")
- (license license:expat)))
-
(define-public go-github-com-operatorfoundation-ed25519
(let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4")
(revision "0"))
@@ -744,6 +717,33 @@ (define-public go-github-com-protonmail-go-crypto
official package.")
(license license:bsd-3)))
+(define-public go-github-com-quic-go-qtls-go1-20
+ (package
+ (name "go-github-com-quic-go-qtls-go1-20")
+ (version "0.3.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/quic-go/qtls-go1-20")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/quic-go/qtls-go1-20"
+ #:go go-1.20))
+ (propagated-inputs
+ (list go-golang-org-x-crypto
+ go-golang-org-x-sys))
+ (home-page "https://github.com/quic-go/qtls-go1-20")
+ (synopsis "TLS 1.3 for QUIC")
+ (description "Go standard library TLS 1.3 implementation, modified for
+QUIC. For Go 1.20.")
+ (license license:expat)))
+
(define-public go-github-com-refraction-networking-utls
(package
(name "go-github-com-refraction-networking-utls")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 32/38] gnu: go-filippo-io-age: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7d660d2f675db1072e71f9138822bd354a5ca88c.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-filippo-io-age): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I4eeadfd946910d56d2441a3469967d681b9e8677
---
gnu/packages/golang-crypto.scm | 32 +++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 29 -----------------------------
2 files changed, 31 insertions(+), 30 deletions(-)

Toggle diff (96 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 9c9e3d26b8..7dede78874 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -11,11 +11,12 @@
;;; Copyright © 2021 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
-;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -53,6 +54,35 @@ (define-module (gnu packages golang-crypto)
;;;
;;; Code:
+(define-public go-filippo-io-age
+ (package
+ (name "go-filippo-io-age")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/FiloSottile/age")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1k1dv1jkr72qpk5g363mhrg9hnf5c9qgv4l16l13m4yh08jp271d"))))
+ (build-system go-build-system)
+ (arguments `(#:import-path "filippo.io/age"))
+ (inputs
+ (list go-golang-org-x-sys
+ go-golang-org-x-term
+ go-golang-org-x-crypto
+ go-filippo-io-edwards25519))
+ (home-page "https://filippo.io/age")
+ (synopsis "Secure file encryption tool, format, and Go library")
+ (description
+ "This package implements file encryption according to the
+@{age-encryption.org/v1, https://age-encryption.org/v1} specification.
+It features small explicit keys, no configuration options, and Unix-style
+composability.")
+ (license license:bsd-3)))
+
(define-public go-filippo-io-edwards25519
(package
(name "go-filippo-io-edwards25519")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d79b351498..245de0dc32 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9375,35 +9375,6 @@ (define-public go-etcd-io-bbolt
(description "This package implements a low-level key/value store in Go.")
(license license:expat)))
-(define-public go-filippo-io-age
- (package
- (name "go-filippo-io-age")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/FiloSottile/age")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1k1dv1jkr72qpk5g363mhrg9hnf5c9qgv4l16l13m4yh08jp271d"))))
- (build-system go-build-system)
- (arguments `(#:import-path "filippo.io/age"))
- (inputs
- (list go-golang-org-x-sys
- go-golang-org-x-term
- go-golang-org-x-crypto
- go-filippo-io-edwards25519))
- (home-page "https://filippo.io/age")
- (synopsis "Secure file encryption tool, format, and Go library")
- (description
- "This package implements file encryption according to the
-@{age-encryption.org/v1, https://age-encryption.org/v1} specification.
-It features small explicit keys, no configuration options, and Unix-style
-composability.")
- (license license:bsd-3)))
-
(define-public age
(package
(inherit go-filippo-io-age)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Jan 10:58 +0100
[PATCH 33/38] gnu: go-github-com-dvsekhvalnov-jose2go: Move to (gnu packages golang-crypto).
(address . 68605@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5626cf52988a5c89f71926c3c833775a4fb21f08.1705743628.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-dvsekhvalnov-jose2go): Move
from here ...
* gnu/packages/golang-crypto.scm: ... to here.

Change-Id: I4c368c9005fd079078726b9165dff380b5092405
---
gnu/packages/golang-crypto.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
2 files changed, 25 insertions(+), 26 deletions(-)

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 7dede78874..a316a89a18 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -300,6 +300,31 @@ (define-public go-github-com-cloudflare-circl
Cryptography (ECC).")
(license license:bsd-3)))
+(define-public go-github-com-dvsekhvalnov-jose2go
+ (package
+ (name "go-github-com-dvsekhvalnov-jose2go")
+ (version "1.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dvsekhvalnov/jose2go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1pzfmv2dxb3m455bi1ks4q3i0dcw1sazxk8k96wrgpkwgglyxj3n"))))
+ (build-system go-build-system)
+ (native-inputs
+ (list go-gopkg-in-check-v1))
+ (arguments
+ '(#:import-path "github.com/dvsekhvalnov/jose2go"))
+ (home-page "https://github.com/dvsekhvalnov/jose2go")
+ (synopsis "Go implementation of Javascript Object Signing and Encryption spec")
+ (description "This package provides a Go library for generating, decoding,
+and encrypting JSON Web Tokens (JWT). It relies only on the standard
+library.")
+ (license license:expat)))
+
(define-public go-github-com-emersion-go-pgpmail
(package
(name "go-github-com-emersion-go-pgpmail")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 245de0dc32..0a55e1ba05 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10622,32 +10622,6 @@ (define-public go-github-com-mtibben-percent
(define-public go-github-com-percent
(deprecated-package "go-github-com-percent" go-github-com-mtibben-percent))
-(define-public go-github-com-dvsekhvalnov-jose2go
- (package
- (name "go-github-com-dvsekhvalnov-jose2go")
- (version "1.5.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dvsekhvalnov/jose2go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1pzfmv2dxb3m455bi1ks4q3i0dcw1sazxk8k96wrgpkwgglyxj3n"))))
- (build-system go-build-system)
- (native-inputs
- (list go-gopkg-in-check-v1))
- (arguments
- '(#:import-path "github.com/dvsekhvalnov/jose2go"
- #:phases %standard-phases))
- (synopsis "Go implementation of Javascript Object Signing and Encryption spec")
- (description
- "This package provides a Go library for generating, decoding, and
-encrypting JSON Web Tokens (JWT). It relies only on the standard library.")
- (home-page "https://github.com/dvsekhvalnov/jose2go")
- (license license:expat)))
-
(define-public aws-vault
(package
(name "aws-vault")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 26 Jan 23:07 +0100
Split (gnu packages golang) part III
(address . 68605@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
87jznvkaty.fsf@gmail.com
Hi,

Gentle ping on this issue, as far as I notice in teams.scm there are
just 2 members in go-team right now one of them is me =).

It this series is good to go I'll re-base it master and merge and start
preparing go-compression module.

Thanks,
Oleg
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmW0LSkACgkQdtcnv/Ys
0rVHww/+Jsk6vsfQOMTssQJfBzNmYDV377FeRAfUOzxZOdYrLOqI2lq0fiGwxoP7
A5tBhYkN6yT+v1wpAaxU3UnQOC8EImDppz7i4vvytFNotpUCobcGlXnxdUKHEFzr
wW+hQV5zXYg/W2w+bVpXabsfqRDQ+xDnbNfKY68CmweflcgO93IrTiZdVfCoPfWp
zN+ZvuCaiweaqKnEweL6SGFTLnP/r57A/86cpH4WIdp4EJj/jFQZ2+iSKqnucTmC
iLFQRMBP7yklIdL+n1rTO3nObI5UIOuRMKH17A9LKLc30UpOVRIrp5zHrRlu4X5V
NJtoIvhBFZL5+nL3c57Ys8lFayilQ28uLmaoz/WbJnL5N8eX0VgNucfcOpe4h/VK
/IP5QSLRlrKJfWKUhKOLo6TX2gc+3dRbaXT9Cz4luMlSOe8xsJwOkeCSE72gd8Ny
CaqTaD2/GGw0MgjgWbwBoMFMFjaQBegRnIHTAzdB2XSKtDLNUZCPOtUVe5hh2OpB
seSlH2B+qqpr0jb+4MaHjmxE2gfjVB3MGhos7/fAA/HLS0nTUqQGgR5udwUvN9OH
TtBhpbuGBBZsCutahbvTT4OwNu2qUj5B3rfiZhY0xFINm9KaYY5aISrMEoddHZJw
KA5V0qvvZdeubcr5suwhE6Cw+NmCU2z9LrYSYXMR/ZA69RMKB+A=
=yAoe
-----END PGP SIGNATURE-----

S
S
Sharlatan Hellseher wrote on 29 Jan 00:51 +0100
(address . 68605-done@debbugs.gnu.org)
87jznthv9a.fsf@gmail.com
Hi,

I've rebased this patch series double checked it has not introduced any
regression and pushed as 77a07a968f..f74789cd54 to master.

Now about to start work for golang-compression.scm and farther sorting from
golang.scm to already existing modules.

Thanks,
Oleg
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmW26IEACgkQdtcnv/Ys
0rWdGg//VMgG58q8/D8SArk6rjpOm3xk+7G2/jzLdVv20PBM7H/3OPhfCjbKqz5N
DsomawQLOQYOrRL1qUSpRVUCnDImwfYzyuZ0e4dKJzoRtqzKHXRHr3IClRUI19sM
/aQQ7gOPNWbThEtVDJTPel19OniloU3J0HD7urAPiOjsThTncR6vK+cUh/qR4f0N
4h1BVyCFJeVF5NxxppeQhxCkGXxQI1x6++ysxzO+1c/iWMSitHCujpiJ6yBqV0sE
RSOpZQeJQv2IlRiifqeQ5FQptKTQW7MWPcM43A8iAx5ldxlP2bybSptLAE8FCP89
+rUhoS5f+BS35R8XGhT9m0vNTuRk2Sw2iXMC12fw3LRuNS+z4WLE9F2cUCitNoIT
Fim6UQCvqu1FjLl+J3okn6rJe5myZlLyiefmjVBzxKz9bX0ACUPW+cmQkeBMQ4JU
159hsy1gy0bOvNs5nri9hahjMqDMHFhWde91tWiPiYm1zX3i/1K4qWnTqml7q4Bl
px4rs9jQEzF+sf3RXq0n1k/aYJc3Ao1DCMV0LycNNDyXWikwSFNMg9DBaFWDTBtF
9dCjMSK28KWz4pXxMF98Ra0JxhB4eQYXWdJuU45g5YOMmuxBngD/iEGR5MlBewHj
KbkgHRY9meYaNVTKlJ9r0choh5y7tA4CozXC7CNvf7Iid8u/pJc=
=BpLC
-----END PGP SIGNATURE-----

Closed
H
H
Hilton Chain wrote on 1 Feb 07:27 +0100
Re: [bug#68605] [PATCH 32/38] gnu: go-filippo-io-age: Move to (gnu packages golang-crypto).
(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
87le844s36.wl-hako@ultrarare.space
Hi Oleg,

On Sat, 20 Jan 2024 17:58:24 +0800,
Sharlatan Hellseher wrote:
Toggle quote (10 lines)
>
> * gnu/packages/golang.scm (go-filippo-io-age): Move from here ...
> * gnu/packages/golang-crypto.scm: ... to here.
>
> Change-Id: I4eeadfd946910d56d2441a3469967d681b9e8677
> ---
> gnu/packages/golang-crypto.scm | 32 +++++++++++++++++++++++++++++++-
> gnu/packages/golang.scm | 29 -----------------------------
> 2 files changed, 31 insertions(+), 30 deletions(-)

This change introduces cyclic module dependencies:
Toggle snippet (35 lines)
$ guix show go-filippo-io-age
Backtrace:
In ice-9/boot-9.scm:
2595:24 19 (call-with-deferred-observers _)
3424:24 18 (_)
222:29 17 (map1 _)
222:29 16 (map1 _)
222:29 15 (map1 _)
222:29 14 (map1 _)
222:29 13 (map1 _)
222:29 12 (map1 _)
222:29 11 (map1 _)
222:17 10 (map1 (((gnu packages golang)) ((gnu packages golang-check))))
3327:17 9 (resolve-interface (gnu packages golang) #:select _ #:hide _ #:prefix _ #:renamer _ # _)
In ice-9/threads.scm:
390:8 8 (_ _)
In ice-9/boot-9.scm:
3253:13 7 (_)
In ice-9/threads.scm:
390:8 6 (_ _)
In ice-9/boot-9.scm:
3544:20 5 (_)
2836:4 4 (save-module-excursion _)
3564:26 3 (_)
In unknown file:
2 (primitive-load-path "gnu/packages/golang" #<procedure 7fb88b068ac0 at ice-9/boot-9.sc…>)
In gnu/packages/golang.scm:
9402:13 1 (_)
In ice-9/boot-9.scm:
1685:16 0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1685:16: In procedure raise-exception:
error: go-filippo-io-age: unbound variable

I found it since some modules involved in the changes I'm going to push are
affected.

I have moved ‘age’ and ‘age-keygen’ to golang-crypto as well in b2eac4455f70 and
95c2de71a4bc to solve this issue.

Thanks
?
Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 68605
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