[PATCH 00/67] Split (gnu packages golang) part II

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

Part II of patch series splitting monolithic (gnu packages golang) into logical
block. This time I've picked up Web related scope which included Golang modules
(libraries) related to HTML, CSS, SCSS, JavaScript, JSON, Web-framework,
REST-API or similar functionality.

As in Part I all local checks passed successfully. I tried not extend the
limit of master branch on affected packages.

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

Toggle quote (1 lines)
> grep -El $(grep define-public gnu/packages/golang-web.scm |cut -d" " -f2 | paste -s -d"\\|" -) gnu/packages/*.scm | sort
gnu/packages/backup.scm
gnu/packages/configuration-management.scm
gnu/packages/databases.scm
gnu/packages/finance.scm
gnu/packages/golang.scm
gnu/packages/golang-web.scm
gnu/packages/high-availability.scm
gnu/packages/ipfs.scm
gnu/packages/mail.scm
gnu/packages/networking.scm
gnu/packages/uucp.scm
gnu/packages/version-control.scm
gnu/packages/web.scm

Modules which use (gnu packages golang-web):

Toggle quote (1 lines)
> grep -r -l "golang-web" . | grep ".*\.scm" | sort
./gnu/packages/backup.scm
./gnu/packages/configuration-management.scm
./gnu/packages/databases.scm
./gnu/packages/finance.scm
./gnu/packages/golang.scm
./gnu/packages/golang-web.scm
./gnu/packages/high-availability.scm
./gnu/packages/ipfs.scm
./gnu/packages/mail.scm
./gnu/packages/networking.scm
./gnu/packages/uucp.scm
./gnu/packages/version-control.scm
./gnu/packages/web.scm


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

Toggle quote (1 lines)
> ./pre-inst-env guix build $(grep define-public gnu/packages/golang-web.scm |cut -d" " -f2)
/gnu/store/y3a2njyshwam18bsbfb1daamg4bkxkm5-go-gopkg-in-square-go-jose-v2-2.6.0
/gnu/store/7xzmkzr4ph0c3kkb4dci3yiri70scqbg-go-github-com-xeipuuv-gojsonschema-0.0.0-0.6b67b3f
/gnu/store/bjqlxk15a5h1s11j5h14arbqmd54638x-go-github-com-xeipuuv-gojsonreference-0.0.0-0.bd5ef7b
/gnu/store/lqwjwz5mrs5vdcfap9n0qyzf3cdls9s2-go-github-com-xeipuuv-gojsonpointer-0.0.0-0.4e3ac27
/gnu/store/6yn73zn1q0xb0qkqd21qd8vy8r7dyyrd-go-github-com-whyrusleeping-json-filter-0.0.0-0.ff25329
/gnu/store/hrdypaif9m42wshgn7l6hb0gsz3k62x0-go-github-com-valyala-fasthttp-1.39.0
/gnu/store/lnr121a2ag8njx02h023xf5vwvyxxkaj-go-github-com-tv42-httpunix-0.0.0-0.2ba4b9c
/gnu/store/8f5ywnxy7ijcgk1ii6xphqr0b84c4jmg-go-github-com-tdewolff-parse-v2-2.6.6
/gnu/store/1mdyppxxx4z3fd276kzf8xn1cnnb42k1-go-github-com-tdewolff-minify-v2-2.12.7
/gnu/store/nm69wcan5ydc1pl5a9x0rnq5nzm02nax-go-github-com-sourcegraph-jsonrpc2-0.1.0
/gnu/store/k2zfsrqzxbf9lg44wwimx6ph83h40vap-go-github-com-puerkitobio-goquery-1.7.0
/gnu/store/zvr2jw8027cj80hwvv5ifbqnnbwjhnws-go-github-com-opentracing-opentracing-go-1.2.0
/gnu/store/aqvwqcsvmvaz2bqwl8phbh856kj7nvb5-go-github-com-nwidger-jsoncolor-0.3.0
/gnu/store/9jgla4b8pvaa88fdl34rr8268xk0zbgr-go-github-com-microcosm-cc-bluemonday-1.0.3
/gnu/store/3bvbddskg8a1ls8m0m0x18i3mr47ywpx-go-github-com-julienschmidt-httprouter-1.3.0
/gnu/store/wxcjh073dcrz9z0x0vsknl61i2ffa18d-go-github-com-jmespath-go-jmespath-0.4.0
/gnu/store/6xhgag2dp7d452k8c976zb1afnxab093-go-github-com-jcmturner-gokrb5-v8-8.4.2
/gnu/store/rwx7j8iafizn3apxpgfaqy4mbhh5pvz5-go-github-com-jcmturner-goidentity-v6-6.0.1
/gnu/store/rj87yi7s0z5z4br61d2zrc5vwvpikh1h-go-github-com-jcmturner-dnsutils-v2-2.0.0
/gnu/store/nd26m97i3vhfxnwb6nshjk40i5ph4znj-go-github-com-hjson-hjson-go-3.1.0
/gnu/store/bvwsf51gdwss9gcilcqsx9ghlgqazayq-go-github-com-gorilla-websocket-1.5.0
/gnu/store/6xyakwdn2sq7i9q1lq9z3dmxcmhqz8ja-go-github-com-gorilla-sessions-1.2.1
/gnu/store/zhd46az905cl15kk89q0maw86bf3s5f5-go-github-com-gorilla-securecookie-1.1.1
/gnu/store/xani16icyll1k323may8mvgwqh0rwr20-go-github-com-gorilla-mux-1.8.0
/gnu/store/gkdmng46jgwxcqlgb2nj84gcymlh14nc-go-github-com-gorilla-handlers-1.5.1
/gnu/store/2dsy2mznxib6ay1vhng6hq4bpfhayi2b-go-github-com-gorilla-css-1.0.0
/gnu/store/9swch7kxxn9f2h50xds047mf328abjp1-go-github-com-gorilla-csrf-1.7.0
/gnu/store/3w9z5icf5j51zkdwv0d46bkwqw9kmy0y-go-github-com-gorilla-context-0.0.0-0.08b5f42
/gnu/store/1z1343fkq402gf441dk8ng2m768lk440-go-github-com-google-safehtml-0.1.0
/gnu/store/2yxy2qbpar2kq3mhih4grwyin6d6jpj6-go-github-com-google-go-github-26.1.3
/gnu/store/jcxldlis745ikndg1yf6bhnzq1ivsdxn-go-github-com-goccy-go-json-0.9.10
/gnu/store/jjp0s9mi9a7l0bwzb6vyn7d3wm8k4xg6-go-github-com-go-telegram-bot-api-telegram-bot-api-4.6.4
/gnu/store/lb2142b9ww9qx60599pnjn7w8j10rdlr-go-github-com-go-chi-chi-v5-5.0.7
/gnu/store/d4z1pz3nswzm60xccskpip2ql6zcm179-go-github-com-getsentry-raven-go-0.2.0-0.5c24d51
/gnu/store/zyw2z3nqrjw4ncklm78v0fmmbdsnwmdg-go-github-com-francoispqt-gojay-1.2.13
/gnu/store/9jn653rizil3n4klhvf1azfmqbdgnv0c-go-github-com-felixge-httpsnoop-1.0.1
/gnu/store/c506g0i9jyjb0sir401292rws4md8w65-go-github-com-emicklei-go-restful-3.4.0
/gnu/store/pkbn07131fh1wd944dannq1ybhzrh5c8-go-github-com-coreos-go-oidc-v3-3.6.0
/gnu/store/ljhsalwrrn0blaj87d0ni1cn28vg8lkg-go-github-com-coreos-go-oidc-2.2.1
/gnu/store/70lwzp46qnpgkx64x1qvwwswhavxxpy0-go-github-com-chris-ramon-douceur-0.2.0
/gnu/store/s7fxah4mgzr20a171p12slb10xzwplqn-go-github-com-bep-golibsass-0.7.0
/gnu/store/fqidgpzlv2p53clq6swx5gs6klj7x4d0-go-github-com-aymerick-douceur-0.2.0
/gnu/store/p2m82l86s24ldkrymhmnizvzq8izmy7f-go-github-com-aws-smithy-go-1.13.5
/gnu/store/7848kpqs3cmmk0s6wjlvlh6zkbsahk2j-go-github-com-aws-aws-sdk-go-v2-service-sts-1.17.7
/gnu/store/iv5ja72dzcgijj10sfhqlp6m9n60bdvq-go-github-com-aws-aws-sdk-go-v2-service-ssooidc-1.13.10
/gnu/store/ggrw8nwi6zwssi37ak9sy6zsrfcjzaqj-go-github-com-aws-aws-sdk-go-v2-service-sso-1.11.27
/gnu/store/8xsf58y9b38vbaspar74yw7nkj90x19x-go-github-com-aws-aws-sdk-go-v2-service-s3-1.30.0
/gnu/store/w99fa8yghdbpjvmpf88yz9i2xiyyq436-go-github-com-aws-aws-sdk-go-v2-service-iam-1.44.161
/gnu/store/n4gxabd1hsjpb11mwfi0n3dzw0wfas86-go-github-com-aws-aws-sdk-go-v2-feature-s3-manager-1.11.44
/gnu/store/dm39p6gw2p8ji67k14wmsm1pw3fjaqy5-go-github-com-aws-aws-sdk-go-v2-config-1.18.5
/gnu/store/zszbl56fshcc2hiz7bcjhw39j9g0mi8b-go-github-com-aws-aws-sdk-go-v2-1.17.3
/gnu/store/gfkmh8ka75j8fvs3q6vkbz7nz4z4q5ad-go-github-com-aws-aws-sdk-go-1.36.18
/gnu/store/j8rakyd65vqbhaw2kvnd10yhfv5yj8wz-go-github-com-aws-sdk-1.35.2
/gnu/store/kj72vci6aj4bxhh18501nq4ygx2yhwif-go-github-com-andybalholm-cascadia-1.3.1
/gnu/store/lqwxq7dfh80ndjnmrm8l0l3pbvbvfwfi-go-cloud-google-com-go-compute-metadata-0.81.0

Toggle quote (1 lines)
> ./pre-inst-env guix refresh --list-dependent $(grep define-public gnu/packages/golang-web.scm |cut -d" " -f2)
Building the following 20 packages would ensure 48 dependent packages are
rebuilt: sendgmail@0.0.0-1.e322915 gopls@0.12.0 restic-rest-server@0.11.0
trezord@2.0.33 yggdrasil@0.4.7 nncp@7.5.0 go-github-com-aws-aws-sdk-go@1.36.18
go-github-com-aws-sdk@1.35.2 aws-vault@6.6.2 nsq@1.2.1 gron@0.7.1
bitmask@0.21.11 kubo@0.15.0 chezmoi@1.8.1 sqls@0.2.18 miniflux@2.0.46 gx@0.14.3
gx-go@1.9.0 lfs-s3@0.1.5 go-github-com-coreos-go-oidc@2.2.1

Some packages were broken before migration:
- go-github-com-charmbracelet-glamour
- chezmoi
- nncp

./pre-inst-env guix build presendgmail@0.0.0-1.e322915 gopls@0.12.0 restic-rest-server@0.11.0 trezord@2.0.33 yggdrasil@0.4.7 go-github-com-aws-sdk@1.35.2 go-github-com-aws-aws-sdk-go@1.36.18 aws-vault@6.6.2 nsq@1.2.1 gron@0.7.1 bitmask@0.21.11 kubo@0.15.0 sqls@0.2.18 miniflux@2.0.46 gx-go@1.9.0 gx@0.14.3 lfs-s3@0.1.5 go-github-com-coreos-go-oidc@2.2.1
/gnu/store/ljhsalwrrn0blaj87d0ni1cn28vg8lkg-go-github-com-coreos-go-oidc-2.2.1
/gnu/store/5yvh8x0nnyfy5jzcnl03zwps7r98nbv6-lfs-s3-0.1.5
/gnu/store/8g14hhra5whiq138hvqkjk9b97g5bmd3-gx-0.14.3
/gnu/store/svx0v7ia5w9mxz9hack9cy36vxcx23hr-gx-go-1.9.0
/gnu/store/cf903c1sw8m6sjilnzzfjwch5ivk1n27-miniflux-2.0.46
/gnu/store/sm7crjqx08za41x3649bs8413f3qnrsn-sqls-0.2.18
/gnu/store/6vvb6zsxsr2g1w3c2czwbiz5763v6f1c-kubo-0.15.0
/gnu/store/kj81lr15fva0hqwsih67ppiz87mn6jls-bitmask-0.21.11
/gnu/store/a4njvjs1q0g1kqbk3i7d5dr2f6hqyhzx-gron-0.7.1
/gnu/store/mx1sp2sq472n2p0fcyvszxzqjp13w86g-nsq-1.2.1
/gnu/store/xq47cdh2djp6c5lc1rjh5gw5d7j9pdn9-aws-vault-6.6.2
/gnu/store/gfkmh8ka75j8fvs3q6vkbz7nz4z4q5ad-go-github-com-aws-aws-sdk-go-1.36.18
/gnu/store/j8rakyd65vqbhaw2kvnd10yhfv5yj8wz-go-github-com-aws-sdk-1.35.2
/gnu/store/b6bss26rwf30jvmz5xbrkmy0cmlzyisq-yggdrasil-0.4.7
/gnu/store/77hywrhvx07yskvh9cjrma9s3fmhs5y1-trezord-2.0.33
/gnu/store/x9j2n972qpgg5mshcxyzvqgrdqsjri09-restic-rest-server-0.11.0
/gnu/store/s5g3xcgqyxr18igiv3i00lnv1ria5jsb-gopls-0.12.0
/gnu/store/v63lgpslx63h29wycwzxnypfqbssll7p-sendgmail-0.0.0-1.e322915

Sharlatan Hellseher (67):
gnu: Add (gnu packages golang-web) module.
gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web).
gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web).
gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web).
gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web).
gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web).
gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-handlers: Remove input labels.
gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web).
gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web).
gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs.
gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web).
gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs.
gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web).
gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs.
gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web).
gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web).
gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web).
gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web).
gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web).
gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web).
gnu: go-github-com-google-safehtml: Remove input labels.
gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web).
gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web).
gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web).
gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web).
gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web).
gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web).
gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web).
gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web).
gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web).
gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web).
gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web).
gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web).
gnu: go-github-com-francoispqt-gojay: Adjust inputs.
gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web).
gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web).
gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web).
gnu: go-github-com-aws-smithy-go: Adjust description.
gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web).
gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web).
gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web).
gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web).
gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web).
gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs.
gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web).
gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web).
gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web).
gnu: go-github-com-stretchr-objx: Move to (gnu packages golang-web).
gnu: go-github-com-google-go-github: Move to (gnu packages golang-web).
gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web).
gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web).
gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web).
gnu: actionlint: Update to 1.6.26.
teams: go-team: Extend scope.

etc/teams.scm | 3 +-
gnu/local.mk | 1 +
gnu/packages/backup.scm | 1 +
gnu/packages/check.scm | 8 +-
gnu/packages/configuration-management.scm | 1 +
gnu/packages/databases.scm | 1 +
gnu/packages/finance.scm | 1 +
gnu/packages/golang-check.scm | 51 +
gnu/packages/golang-web.scm | 1466 ++++++++++++++++++++
gnu/packages/golang.scm | 1532 +--------------------
gnu/packages/high-availability.scm | 1 +
gnu/packages/ipfs.scm | 1 +
gnu/packages/mail.scm | 1 +
gnu/packages/networking.scm | 1 +
gnu/packages/uucp.scm | 1 +
gnu/packages/version-control.scm | 1 +
gnu/packages/web.scm | 1 +
17 files changed, 1574 insertions(+), 1498 deletions(-)
create mode 100644 gnu/packages/golang-web.scm


base-commit: 2de30042674197fe451c220745186e36465d06e2
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 02/67] gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
397c9e9fccb9c3a2c330d606fb01fb62aa0b6d62.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-mux): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada
---
gnu/packages/finance.scm | 1 +
gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/web.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (102 lines)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 4f3415232c..71dff964d5 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -93,6 +93,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index feb2854d9c..c779600411 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,6 +34,29 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-gorilla-mux
+ (package
+ (name "go-github-com-gorilla-mux")
+ (version "1.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/mux")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/mux"))
+ (home-page "https://github.com/gorilla/mux")
+ (synopsis "URL router and dispatcher for Go")
+ (description
+ "Gorilla/Mux implements a request router and dispatcher for matching
+incoming requests with their respective handler.")
+ (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 b32e379e47..212f5a2303 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4701,30 +4701,6 @@ (define-public go-github-com-gorilla-context
(description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
(license license:bsd-3))))
-(define-public go-github-com-gorilla-mux
- (package
- (name "go-github-com-gorilla-mux")
- (version "1.8.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/mux")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/mux"))
- (home-page "https://github.com/gorilla/mux")
- (synopsis "URL router and dispatcher for Go")
- (description
- "Gorilla/Mux implements a request router and dispatcher for matching
-incoming requests with their respective handler.")
- (license license:bsd-3)))
-
(define-public go-github-com-andybalholm-brotli
(package
(name "go-github-com-andybalholm-brotli")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b1cdfda862..1576f39052 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -141,6 +141,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 01/67] gnu: Add (gnu packages golang-web) module.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d6dc68b7cfa8dcda2503ad17509deefed4da08ee.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-web.scm scope.
---
gnu/local.mk | 1 +
gnu/packages/golang-web.scm | 39 +++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
create mode 100644 gnu/packages/golang-web.scm

Toggle diff (59 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index a00884a7c6..dda24f5083 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -303,6 +303,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
%D%/packages/golang-check.scm \
+ %D%/packages/golang-web.scm \
%D%/packages/gperf.scm \
%D%/packages/gpodder.scm \
%D%/packages/gps.scm \
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
new file mode 100644
index 0000000000..feb2854d9c
--- /dev/null
+++ b/gnu/packages/golang-web.scm
@@ -0,0 +1,39 @@
+;;; 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-web)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix build-system go)
+ #:use-module (guix git-download)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages golang))
+
+;;; Commentary:
+;;;
+;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON,
+;;; Web-framework, REST-API or similar functionality.
+;;;
+;;; 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 30 Oct 2023 02:08
[PATCH 03/67] gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
80ac46f891a50ff2393649a3e1223990409783e0.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-css): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module.
* gnu/packages/golang.scm: As above...

Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f
---
gnu/packages/configuration-management.scm | 1 +
gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 23 +----------------------
3 files changed, 25 insertions(+), 22 deletions(-)

Toggle diff (96 lines)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 95a7e8615f..296f48dcd5 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages version-control)
#:use-module (gnu packages textutils)
#:use-module ((guix licenses) #:prefix license:)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c779600411..1d61a76268 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,28 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-gorilla-css
+ (package
+ (name "go-github-com-gorilla-css")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/css")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/gorilla/css/scanner"
+ #:unpack-path "github.com/gorilla/css"))
+ (home-page "https://github.com/gorilla/css/")
+ (synopsis "CSS3 tokenizer")
+ (description "This package provides a CSS3 tokenizer.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-mux
(package
(name "go-github-com-gorilla-mux")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 212f5a2303..a895395cc8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -79,6 +79,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-web)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages mp3)
@@ -4655,28 +4656,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-gorilla-css
- (package
- (name "go-github-com-gorilla-css")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/css")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gorilla/css/scanner"
- #:unpack-path "github.com/gorilla/css"))
- (home-page "https://github.com/gorilla/css/")
- (synopsis "CSS3 tokenizer")
- (description "This package provides a CSS3 tokenizer.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-context
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 04/67] gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0d05fdf4d4094a9cceff7e530b82c2eb77591ec9.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aymerick-douceur): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1d61a76268..39a83990ce 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -35,6 +35,32 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-aymerick-douceur
+ (package
+ (name "go-github-com-aymerick-douceur")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aymerick/douceur/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/aymerick/douceur"))
+ (native-inputs
+ (list go-github-com-andybalholm-cascadia
+ go-github-com-gorilla-css
+ go-github-com-puerkitobio-goquery
+ go-golang-org-x-net))
+ (home-page "https://github.com/aymerick/douceur/")
+ (synopsis "CSS parser and inliner")
+ (description "This package provides a CSS parser and inliner.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a895395cc8..27c81850dd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9278,31 +9278,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-aymerick-douceur
- (package
- (name "go-github-com-aymerick-douceur")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aymerick/douceur/")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/aymerick/douceur"))
- (native-inputs
- (list go-github-com-puerkitobio-goquery
- go-github-com-andybalholm-cascadia go-golang-org-x-net
- go-github-com-gorilla-css))
- (home-page "https://github.com/aymerick/douceur/")
- (synopsis "CSS parser and inliner")
- (description "This package provides a CSS parser and inliner.")
- (license license:expat)))
-
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 05/67] gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e9897cea7073afadf47ad0d5b3b0b626d3650f76.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-andybalholm-cascadia): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 39a83990ce..3c1abfff2c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,30 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-andybalholm-cascadia
+ (package
+ (name "go-github-com-andybalholm-cascadia")
+ (version "1.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/andybalholm/cascadia")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/andybalholm/cascadia"))
+ (native-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/andybalholm/cascadia/")
+ (synopsis "CSS selectors for HTML")
+ (description "The Cascadia package implements CSS selectors for use with
+the parse trees produced by the html package.")
+ (license license:bsd-2)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 27c81850dd..59fd821486 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9203,30 +9203,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-andybalholm-cascadia
- (package
- (name "go-github-com-andybalholm-cascadia")
- (version "1.3.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/andybalholm/cascadia")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/andybalholm/cascadia"))
- (native-inputs
- (list go-golang-org-x-net))
- (home-page "https://github.com/andybalholm/cascadia/")
- (synopsis "CSS selectors for HTML")
- (description "The Cascadia package implements CSS selectors for use with
-the parse trees produced by the html package.")
- (license license:bsd-2)))
-
(define-public go-github-com-puerkitobio-goquery
(package
(name "go-github-com-puerkitobio-goquery")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 06/67] gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2bd4cf4ee257cc215b3aaaa29a71909f8af64a2c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-puerkitobio-goquery): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (81 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3c1abfff2c..8d8b4fb85c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,8 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
@@ -131,6 +133,30 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-puerkitobio-goquery
+ (package
+ (name "go-github-com-puerkitobio-goquery")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/PuerkitoBio/goquery")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/PuerkitoBio/goquery"))
+ (propagated-inputs
+ (list go-github-com-andybalholm-cascadia go-golang-org-x-net))
+ (home-page "https://github.com/PuerkitoBio/goquery")
+ (synopsis "Features similar to jQuery to the Go language")
+ (description "@code{goquery} brings a syntax and a set of features similar
+to jQuery to the Go language.")
+ (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 59fd821486..c516caef30 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9203,30 +9203,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-puerkitobio-goquery
- (package
- (name "go-github-com-puerkitobio-goquery")
- (version "1.7.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/PuerkitoBio/goquery")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/PuerkitoBio/goquery"))
- (propagated-inputs
- (list go-github-com-andybalholm-cascadia go-golang-org-x-net))
- (home-page "https://github.com/PuerkitoBio/goquery")
- (synopsis "Features similar to jQuery to the Go language")
- (description "@code{goquery} brings a syntax and a set of features similar
-to jQuery to the Go language.")
- (license license:bsd-3)))
-
(define-public go-github-com-jmespath-go-jmespath
(package
(name "go-github-com-jmespath-go-jmespath")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 07/67] gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
92ec81268913ea2449e55d32468cb21930fb59da.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-chris-ramon-douceur): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (89 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 8d8b4fb85c..79a69bc842 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
@@ -88,6 +88,34 @@ (define-public go-github-com-aymerick-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-chris-ramon-douceur
+ (package
+ (name "go-github-com-chris-ramon-douceur")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chris-ramon/douceur")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/chris-ramon/douceur"))
+ (propagated-inputs
+ (list go-github-com-aymerick-douceur
+ go-github-com-gorilla-css))
+ (native-inputs
+ (list go-github-com-puerkitobio-goquery
+ go-github-com-andybalholm-cascadia
+ go-golang-org-x-net))
+ (home-page "https://github.com/chris-ramon/douceur/")
+ (synopsis "CSS parser and inliner")
+ (description "This package provides a CSS parser and inliner.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c516caef30..0ed377232b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9230,34 +9230,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-chris-ramon-douceur
- (package
- (name "go-github-com-chris-ramon-douceur")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/chris-ramon/douceur")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/chris-ramon/douceur"))
- (propagated-inputs
- (list go-github-com-aymerick-douceur
- go-github-com-gorilla-css))
- (native-inputs
- (list go-github-com-puerkitobio-goquery
- go-github-com-andybalholm-cascadia
- go-golang-org-x-net))
- (home-page "https://github.com/chris-ramon/douceur/")
- (synopsis "CSS parser and inliner")
- (description "This package provides a CSS parser and inliner.")
- (license license:expat)))
-
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 08/67] gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c35d3f8fd54d202626a4b7e60032e8b90bf5712c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-websocket): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/ipfs.scm: Add (gnu packages golang-web) module.

Change-Id: I844738ec0b178a6a1746b01659c93a20919c2736
---
gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 21 ---------------------
gnu/packages/ipfs.scm | 1 +
3 files changed, 24 insertions(+), 21 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 79a69bc842..0ca70cec38 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -161,6 +162,28 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-websocket
+ (package
+ (name "go-github-com-gorilla-websocket")
+ (version "1.5.0")
+ (home-page "https://github.com/gorilla/websocket")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/gorilla/websocket"))
+ (synopsis "Fast WebSocket implementation for Go")
+ (description "Gorilla WebSocket is a Go implementation of the WebSocket
+protocol.")
+ (license license:bsd-2)))
+
(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 0ed377232b..97c9d9a663 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12646,27 +12646,6 @@ (define-public go-github-com-google-shlex
using shell-style rules for quoting and commenting.")
(license license:asl2.0)))
-(define-public go-github-com-gorilla-websocket
- (package
- (name "go-github-com-gorilla-websocket")
- (version "1.5.0")
- (home-page "https://github.com/gorilla/websocket")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gorilla/websocket"))
- (synopsis "Fast WebSocket implementation for Go")
- (description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.")
- (license license:bsd-2)))
-
(define-public go-github-com-sourcegraph-jsonrpc2
(package
(name "go-github-com-sourcegraph-jsonrpc2")
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a4c0613e40..fc66582c8a 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-web)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
#:use-module (gnu packages syncthing))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 09/67] gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
18851d674ab6e0798653887709fa6f17691344a7.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-sourcegraph-jsonrpc2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/databases.scm: Add (gnu packages golang-web) module.

Change-Id: Idda2e18ae5d3e19f72265bdd017eadddc25bcad9
---
gnu/packages/databases.scm | 1 +
gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
3 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (88 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4bc642aa17..0d43ae5c88 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -107,6 +107,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0ca70cec38..f9e7039707 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -208,6 +208,32 @@ (define-public go-github-com-puerkitobio-goquery
to jQuery to the Go language.")
(license license:bsd-3)))
+(define-public go-github-com-sourcegraph-jsonrpc2
+ (package
+ (name "go-github-com-sourcegraph-jsonrpc2")
+ (version "0.1.0")
+ (home-page "https://github.com/sourcegraph/jsonrpc2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/sourcegraph/jsonrpc2"))
+ (propagated-inputs
+ (list go-github-com-daviddengcn-go-colortext
+ go-github-com-gorilla-websocket
+ go-github-com-motemen-go-colorine))
+ (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
+ (description
+ "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
+ (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 97c9d9a663..97c89407a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12646,32 +12646,6 @@ (define-public go-github-com-google-shlex
using shell-style rules for quoting and commenting.")
(license license:asl2.0)))
-(define-public go-github-com-sourcegraph-jsonrpc2
- (package
- (name "go-github-com-sourcegraph-jsonrpc2")
- (version "0.1.0")
- (home-page "https://github.com/sourcegraph/jsonrpc2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/sourcegraph/jsonrpc2"))
- (propagated-inputs
- (list
- go-github-com-daviddengcn-go-colortext
- go-github-com-motemen-go-colorine
- go-github-com-gorilla-websocket))
- (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
- (description
- "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
- (license license:expat)))
-
(define-public go-github-com-disintegration-imaging
(package
(name "go-github-com-disintegration-imaging")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 11/67] gnu: go-github-com-gorilla-handlers: Remove input labels.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
fcc47d5ee770a3e624bb5b01ee4a6f033fbc925c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-gorilla-handlers): Remove labels.

Change-Id: I955408970a64d03823327912fdafcac5d7fbda93
---
gnu/packages/golang-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0480f648eb..3a3c5f9621 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -154,11 +154,11 @@ (define-public go-github-com-gorilla-handlers
(sha256
(base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
(build-system go-build-system)
- (propagated-inputs
- `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
(arguments
'(#:tests? #f ; Tries to download from the internet
#:import-path "github.com/gorilla/handlers"))
+ (propagated-inputs
+ (list go-github-com-felixge-httpsnoop))
(home-page "https://github.com/gorilla/handlers")
(synopsis "Middleware for Go HTTP services and web applications")
(description "A collection of useful middleware for Go HTTP services and
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 10/67] gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
596e4ed5e4bb1b7df959b93083cee1fcffc31f1f.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-handlers): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: I7535bdecc681e230f4aee70115a3dea847d40e6f
---
gnu/packages/backup.scm | 1 +
gnu/packages/golang-web.scm | 28 +++++++++++++++++++++++++++-
gnu/packages/golang.scm | 26 --------------------------
3 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (99 lines)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 12c4a45b9d..8e0a782f91 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-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f9e7039707..0480f648eb 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,9 +1,10 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
@@ -139,6 +140,31 @@ (define-public go-github-com-gorilla-css
(description "This package provides a CSS3 tokenizer.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-handlers
+ (package
+ (name "go-github-com-gorilla-handlers")
+ (version "1.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/handlers")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
+ (arguments
+ '(#:tests? #f ; Tries to download from the internet
+ #:import-path "github.com/gorilla/handlers"))
+ (home-page "https://github.com/gorilla/handlers")
+ (synopsis "Middleware for Go HTTP services and web applications")
+ (description "A collection of useful middleware for Go HTTP services and
+web applications.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-mux
(package
(name "go-github-com-gorilla-mux")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 97c89407a5..7c7167b3b6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4706,32 +4706,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-handlers
- (package
- (name "go-github-com-gorilla-handlers")
- (version "1.5.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/handlers")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
- (build-system go-build-system)
- (propagated-inputs
- `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
- (arguments
- '(#:tests? #f ; Tries to download from the internet
- #:import-path "github.com/gorilla/handlers"))
- (home-page "https://github.com/gorilla/handlers")
- (synopsis "Middleware for Go HTTP services and web applications")
- (description "A collection of useful middleware for Go HTTP services
-and web applications.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-securecookie
(package
(name "go-github-com-gorilla-securecookie")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 12/67] gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1bc9676dee844eaab13548ad7033daf6d1c3e5f4.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-felixge-httpsnoop): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (73 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3a3c5f9621..c0ceb5b7ce 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -118,6 +118,30 @@ (define-public go-github-com-chris-ramon-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-felixge-httpsnoop
+ (package
+ (name "go-github-com-felixge-httpsnoop")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/felixge/httpsnoop")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/felixge/httpsnoop"))
+ (home-page "https://github.com/felixge/httpsnoop/")
+ (synopsis "Capture http related metrics")
+ (description
+ "Httpsnoop provides an easy way to capture http related
+metrics (i.e. response time, bytes written, and http status code) from your
+application's http.Handlers.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7c7167b3b6..2dae111af4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4984,31 +4984,6 @@ (define-public go-github-com-spf13-viper
all types of configuration needs and formats.")
(license license:expat)))
-(define-public go-github-com-felixge-httpsnoop
- (package
- (name "go-github-com-felixge-httpsnoop")
- (version "1.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/felixge/httpsnoop")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/felixge/httpsnoop"))
- (home-page "https://github.com/felixge/httpsnoop/")
- (synopsis "Capture http related metrics")
- (description
- "Httpsnoop provides an easy way to capture http related
-metrics (i.e. response time, bytes written, and http status code) from your
-application's http.Handlers.")
- (license license:expat)))
-
(define-public go-github-com-fsnotify-fsnotify
(package
(name "go-github-com-fsnotify-fsnotify")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 13/67] gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
69d644091dbe49b980d94e6e122d12ae3ebed658.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-securecookie): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (73 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c0ceb5b7ce..1a77e0f6f2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -212,6 +212,30 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-securecookie
+ (package
+ (name "go-github-com-gorilla-securecookie")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/securecookie")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/securecookie"))
+ (home-page "https://github.com/gorilla/securecookie")
+ (synopsis "Encodes and decodes authenticated and optionally encrypted
+cookie values")
+ (description
+ "Gorilla/securecookie encodes and decodes authenticated and optionally
+encrypted cookie values for Go web applications.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2dae111af4..8ccf611b11 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4706,31 +4706,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-securecookie
- (package
- (name "go-github-com-gorilla-securecookie")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/securecookie")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/securecookie"))
- (home-page "https://github.com/gorilla/securecookie")
- (synopsis "Encodes and decodes authenticated and optionally encrypted
-cookie values")
- (description
- "Gorilla/securecookie encodes and decodes authenticated and optionally
-encrypted cookie values for Go web applications.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-sessions
(package
(name "go-github-com-gorilla-sessions")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 14/67] gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7de3ee7b888ae0b96cc48ef84bff157987b185d8.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-sessions): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (83 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1a77e0f6f2..971b370115 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -236,6 +237,32 @@ (define-public go-github-com-gorilla-securecookie
encrypted cookie values for Go web applications.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-sessions
+ (package
+ (name "go-github-com-gorilla-sessions")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/sessions")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/sessions"))
+ (propagated-inputs
+ (list go-github-com-gorilla-securecookie))
+ (home-page "https://github.com/gorilla/sessions")
+ (synopsis "Manage user sessions in web applications")
+ (description
+ "This package that provides infrastructure for creating and managing user
+sessions in web applications. It supports cookie and filesystem-based
+sessions, flash messages, custom backends, and more.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8ccf611b11..50bf035df7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4706,31 +4706,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-sessions
- (package
- (name "go-github-com-gorilla-sessions")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/sessions")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/sessions"))
- (propagated-inputs (list go-github-com-gorilla-securecookie))
- (home-page "https://github.com/gorilla/sessions")
- (synopsis "Manage user sessions in web applications")
- (description
- "This package that provides infrastructure for creating and
-managing user sessions in web applications. It supports cookie and
-filesystem-based sessions, flash messages, custom backends, and more.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 15/67] gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0d819f076c7bd3e893fef62b6a374f961d2ff576.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-gokrb5-v8): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: Ie7833a1f5712cc3899fd140741774e6b71f03967
---
gnu/packages/golang-web.scm | 52 ++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 48 ----------------------------------
2 files changed, 51 insertions(+), 49 deletions(-)

Toggle diff (131 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 971b370115..ae10a86551 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -30,7 +30,8 @@ (define-module (gnu packages golang-web)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check))
;;; Commentary:
;;;
@@ -285,6 +286,55 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-jcmturner-gokrb5-v8
+ (package
+ (name "go-github-com-jcmturner-gokrb5-v8")
+ (version "8.4.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/gokrb5")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/gokrb5/v8"
+ #:unpack-path "github.com/jcmturner/gokrb5"))
+ (propagated-inputs
+ (list go-github-com-gorilla-sessions
+ go-github-com-hashicorp-go-uuid
+ go-github-com-jcmturner-aescts-v2
+ go-github-com-jcmturner-dnsutils-v2
+ go-github-com-jcmturner-gofork
+ go-github-com-jcmturner-goidentity-v6
+ go-github-com-jcmturner-rpc-v2-mstypes
+ go-github-com-jcmturner-rpc-v2-ndr
+ go-github-com-stretchr-testify
+ go-golang-org-x-crypto
+ go-golang-org-x-net))
+ (home-page "https://github.com/jcmturner/gokrb5")
+ (synopsis "Pure Go Kerberos library for clients and services")
+ (description "This package provides a pure Go Kerberos library. It
+features:
+@itemize
+@item Kerberos libraries for custom integration
+@item Parsing Keytab files
+@item Parsing krb5.conf files
+@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami))
+@end itemize
+
+On the client side, it provides a client that can authenticate to an SPNEGO
+Kerberos authenticated web service, and the ability to change client's
+password.
+
+On the server side, the library provides a HTTP handler wrapper implements
+SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
+Microsoft AD PAC authorization data.")
+ (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 50bf035df7..e7ccf09837 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1436,54 +1436,6 @@ (define-public go-github-com-jcmturner-gofork
arounds until issues are addressed in the official distribution.")
(license license:bsd-3)))
-(define-public go-github-com-jcmturner-gokrb5-v8
- (package
- (name "go-github-com-jcmturner-gokrb5-v8")
- (version "8.4.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/gokrb5")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/gokrb5/v8"
- #:unpack-path "github.com/jcmturner/gokrb5"))
- (propagated-inputs (list go-golang-org-x-net
- go-golang-org-x-crypto
- go-github-com-stretchr-testify
- go-github-com-jcmturner-rpc-v2-ndr
- go-github-com-jcmturner-rpc-v2-mstypes
- go-github-com-jcmturner-goidentity-v6
- go-github-com-jcmturner-gofork
- go-github-com-jcmturner-dnsutils-v2
- go-github-com-jcmturner-aescts-v2
- go-github-com-hashicorp-go-uuid
- go-github-com-gorilla-sessions))
- (home-page "https://github.com/jcmturner/gokrb5")
- (synopsis "Pure Go Kerberos library for clients and services")
- (description "This package provides a pure Go Kerberos library. It
-features:
-@itemize
-@item Kerberos libraries for custom integration
-@item Parsing Keytab files
-@item Parsing krb5.conf files
-@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami))
-@end itemize
-
-On the client side, it provides a client that can authenticate to an SPNEGO
-Kerberos authenticated web service, and the ability to change client's
-password.
-
-On the server side, the library provides a HTTP handler wrapper implements
-SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
-Microsoft AD PAC authorization data.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-rpc
(package
(name "go-github-com-jcmturner-rpc")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 16/67] gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b2af7d8877ac72ac1042b12537e34dc1b34aa66c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-gokrb5-v8)
[propagated-inputs]: go-github-com-stretchr-testify move from here ...
[native-inputs]: ... to here.

Change-Id: I93be99c60c15ba7861dd909e8856c800f8cf8314
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ae10a86551..580877f8fe 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -303,6 +303,8 @@ (define-public go-github-com-jcmturner-gokrb5-v8
(arguments
'(#:import-path "github.com/jcmturner/gokrb5/v8"
#:unpack-path "github.com/jcmturner/gokrb5"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-gorilla-sessions
go-github-com-hashicorp-go-uuid
@@ -312,7 +314,6 @@ (define-public go-github-com-jcmturner-gokrb5-v8
go-github-com-jcmturner-goidentity-v6
go-github-com-jcmturner-rpc-v2-mstypes
go-github-com-jcmturner-rpc-v2-ndr
- go-github-com-stretchr-testify
go-golang-org-x-crypto
go-golang-org-x-net))
(home-page "https://github.com/jcmturner/gokrb5")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 17/67] gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ee618c0920f01fccb97b310379f8229e4b96989a.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-dnsutils-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (79 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 580877f8fe..9b2bcd7cbd 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -286,6 +286,34 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-jcmturner-dnsutils-v2
+ (package
+ (name "go-github-com-jcmturner-dnsutils-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/dnsutils")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/dnsutils/v2"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/jcmturner/dnsutils")
+ (synopsis "Go library with DNS utils")
+ (description
+ "The dnsutils package provides a Go function to return a map of Service
+Records (SRV) in the order they should be used for a given service, protocol
+and name. The order is determined by the records' priority and randomized
+selection based on their relative weighting. This package is useful for
+network applications that require accessing services using SRV records.")
+ (license license:asl2.0)))
+
(define-public go-github-com-jcmturner-gokrb5-v8
(package
(name "go-github-com-jcmturner-gokrb5-v8")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e7ccf09837..b058520e47 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1362,33 +1362,6 @@ (define-public go-github-com-jcmturner-aescts-v2
encryption and decryption methods.")
(license license:asl2.0)))
-(define-public go-github-com-jcmturner-dnsutils-v2
- (package
- (name "go-github-com-jcmturner-dnsutils-v2")
- (version "2.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/dnsutils")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/dnsutils/v2"))
- (propagated-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/jcmturner/dnsutils")
- (synopsis "Go library with DNS utils")
- (description
- "The dnsutils package provides a Go function to return a map of Service
-Records (SRV) in the order they should be used for a given service, protocol
-and name. The order is determined by the records' priority and randomized
-selection based on their relative weighting. This package is useful for
-network applications that require accessing services using SRV records.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-goidentity-v6
(package
(name "go-github-com-jcmturner-goidentity-v6")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 18/67] gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
faf001f4aaca20928bbde4aacec6579c556b758f.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-dnsutils-v2):
Swap propagated-inputs to native-inputs.

Change-Id: I1d02b45559214d72828a78437766cf7c1e06f1b0
---
gnu/packages/golang-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9b2bcd7cbd..6a832291ab 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -302,7 +302,7 @@ (define-public go-github-com-jcmturner-dnsutils-v2
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jcmturner/dnsutils/v2"))
- (propagated-inputs
+ (native-inputs
(list go-github-com-stretchr-testify))
(home-page "https://github.com/jcmturner/dnsutils")
(synopsis "Go library with DNS utils")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 19/67] gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
80d2dbe7c1028af093a94b44c8889b0029295aa2.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-goidentity-v6): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 6a832291ab..751eb41b58 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -314,6 +314,30 @@ (define-public go-github-com-jcmturner-dnsutils-v2
network applications that require accessing services using SRV records.")
(license license:asl2.0)))
+(define-public go-github-com-jcmturner-goidentity-v6
+ (package
+ (name "go-github-com-jcmturner-goidentity-v6")
+ (version "6.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/goidentity")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/goidentity/v6"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
+ (home-page "https://github.com/jcmturner/goidentity")
+ (synopsis "Hold authenticated identities and their attributes")
+ (description "This package provides a standard interface for holding
+authenticated identities and their attributes.")
+ (license license:asl2.0)))
+
(define-public go-github-com-jcmturner-gokrb5-v8
(package
(name "go-github-com-jcmturner-gokrb5-v8")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b058520e47..37eaa0fc2c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1362,30 +1362,6 @@ (define-public go-github-com-jcmturner-aescts-v2
encryption and decryption methods.")
(license license:asl2.0)))
-(define-public go-github-com-jcmturner-goidentity-v6
- (package
- (name "go-github-com-jcmturner-goidentity-v6")
- (version "6.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/goidentity")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/goidentity/v6"))
- (propagated-inputs
- (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
- (home-page "https://github.com/jcmturner/goidentity")
- (synopsis "Hold authenticated identities and their attributes")
- (description "This package provides a standard interface for holding
-authenticated identities and their attributes.")
- (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 30 Oct 2023 02:08
[PATCH 20/67] gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
805b490f7e22c07a1505d31e5ecd10c5fb4a8666.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-goidentity-v6):
[propagated-inputs]: Move go-github-com-stretchr-testify from here ...
[native-inputs]: ... to here.

Change-Id: I1e7bd72b3bf1c0879426a6a4c5b3b1de1d316069
---
gnu/packages/golang-web.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (18 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 751eb41b58..8ced6a4c6f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -330,8 +330,10 @@ (define-public go-github-com-jcmturner-goidentity-v6
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jcmturner/goidentity/v6"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
- (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
+ (list go-github-com-hashicorp-go-uuid))
(home-page "https://github.com/jcmturner/goidentity")
(synopsis "Hold authenticated identities and their attributes")
(description "This package provides a standard interface for holding
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 21/67] gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
948af30905730edce02bf56ee04506048b04d419.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-csrf): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 8ced6a4c6f..5be08caf2e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -144,6 +144,32 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-gorilla-csrf
+ (package
+ (name "go-github-com-gorilla-csrf")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/csrf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
+ ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
+ (arguments
+ '(#:import-path "github.com/gorilla/csrf"))
+ (home-page "https://github.com/gorilla/csrf")
+ (synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
+ (description
+ "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
+middleware for Go web applications and services.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 37eaa0fc2c..969cbd886f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4607,33 +4607,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-csrf
- (package
- (name "go-github-com-gorilla-csrf")
- (version "1.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/csrf")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
- (build-system go-build-system)
- (propagated-inputs
- `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
- ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
- (arguments
- '(#:import-path "github.com/gorilla/csrf"))
- (home-page "https://github.com/gorilla/csrf")
- (synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
- (description
- "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
-middleware for Go web applications and services.")
- (license license:bsd-3)))
-
(define-public go-github-com-jonboulle-clockwork
(let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 22/67] gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3cfba248549489bcfc89dba55708962a67f0663d.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tdewolff-minify-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (121 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5be08caf2e..d82cac46b9 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -28,6 +29,7 @@ (define-module (gnu packages golang-web)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix build-system go)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
@@ -466,6 +468,47 @@ (define-public go-github-com-sourcegraph-jsonrpc2
"Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
(license license:expat)))
+(define-public go-github-com-tdewolff-minify-v2
+ (package
+ (name "go-github-com-tdewolff-minify-v2")
+ (version "2.12.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/minify")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tdewolff/minify/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-hash
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion
+ (format #f "src/~a/~a" import-path dir)
+ (make-file-writable "hash.go")
+ (format #t "Generating `hash.go' for ~a...~%" dir)
+ (invoke "go" "generate")))
+ '("css" "html" "svg")))))))
+ (propagated-inputs
+ (list go-github-com-tdewolff-parse-v2))
+ (native-inputs
+ (list go-github-com-tdewolff-hasher
+ go-github-com-tdewolff-test))
+ (home-page "https://go.tacodewolff.nl/minify")
+ (synopsis "Go minifiers for web formats")
+ (description
+ "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and
+an interface to implement any other minifier.")
+ (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 969cbd886f..143487c881 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3436,46 +3436,6 @@ (define-public go-github-com-tdewolff-hasher
@code{string} to @code{uint32} mapper.")
(license license:bsd-3)))
-(define-public go-github-com-tdewolff-minify-v2
- (package
- (name "go-github-com-tdewolff-minify-v2")
- (version "2.12.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/minify")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/minify/v2"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-hash
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each
- (lambda (dir)
- (with-directory-excursion
- (format #f "src/~a/~a" import-path dir)
- (make-file-writable "hash.go")
- (format #t "Generating `hash.go' for ~a...~%" dir)
- (invoke "go" "generate")))
- '("css" "html" "svg")))))))
- (propagated-inputs
- (list go-github-com-tdewolff-parse-v2))
- (native-inputs
- (list go-github-com-tdewolff-hasher
- go-github-com-tdewolff-test))
- (home-page "https://go.tacodewolff.nl/minify")
- (synopsis "Go minifiers for web formats")
- (description
- "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and
-an interface to implement any other minifier.")
- (license license:expat)))
-
(define-public go-github-com-tdewolff-parse-v2
(package
(name "go-github-com-tdewolff-parse-v2")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 23/67] gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
49e2740848a1c005b78a034f01e581e15f369efb.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tdewolff-parse-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (99 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d82cac46b9..9e68e96baf 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -509,6 +509,44 @@ (define-public go-github-com-tdewolff-minify-v2
an interface to implement any other minifier.")
(license license:expat)))
+(define-public go-github-com-tdewolff-parse-v2
+ (package
+ (name "go-github-com-tdewolff-parse-v2")
+ (version "2.6.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/parse")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tdewolff/parse/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-hash
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion
+ (format #f "src/~a/~a" import-path dir)
+ (make-file-writable "hash.go")
+ (format #t "Generating `hash.go' for ~a...~%" dir)
+ (invoke "go" "generate")))
+ '("css" "html")))))))
+ (native-inputs
+ (list go-github-com-tdewolff-hasher
+ go-github-com-tdewolff-test))
+ (home-page "https://github.com/tdewolff/parse")
+ (synopsis "Go parsers for web formats")
+ (description
+ "This package contains several lexers and parsers written 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 143487c881..010485c8b9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3436,43 +3436,6 @@ (define-public go-github-com-tdewolff-hasher
@code{string} to @code{uint32} mapper.")
(license license:bsd-3)))
-(define-public go-github-com-tdewolff-parse-v2
- (package
- (name "go-github-com-tdewolff-parse-v2")
- (version "2.6.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/parse")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/parse/v2"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-hash
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each
- (lambda (dir)
- (with-directory-excursion
- (format #f "src/~a/~a" import-path dir)
- (make-file-writable "hash.go")
- (format #t "Generating `hash.go' for ~a...~%" dir)
- (invoke "go" "generate")))
- '("css" "html")))))))
- (native-inputs
- (list go-github-com-tdewolff-hasher
- go-github-com-tdewolff-test))
- (home-page "https://github.com/tdewolff/parse")
- (synopsis "Go parsers for web formats")
- (description
- "This package contains several lexers and parsers written in Go.")
- (license license:expat)))
-
(define-public go-github-com-tj-docopt
(package
(name "go-github-com-tj-docopt")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 24/67] gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
14513a7f19a66b697180298dc0edee73b8124994.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-context): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9e68e96baf..012ed0429c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -146,6 +146,32 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-gorilla-context
+ (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
+ (revision "0"))
+ (package
+ (name "go-github-com-gorilla-context")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/context")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/context"))
+ (home-page "https://github.com/gorilla/context")
+ (synopsis "Go registry for request variables")
+ (description
+ "This package provides @code{gorilla/context}, which is a general
+purpose registry for global request variables in the Go programming
+language.")
+ (license license:bsd-3))))
+
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 010485c8b9..03a96970ec 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4480,30 +4480,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-gorilla-context
- (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
- (revision "0"))
- (package
- (name "go-github-com-gorilla-context")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/context")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/context"))
- (home-page "https://github.com/gorilla/context")
- (synopsis "Go registry for request variables")
- (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
- (license license:bsd-3))))
-
(define-public go-github-com-andybalholm-brotli
(package
(name "go-github-com-andybalholm-brotli")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 25/67] gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
75cf0368e6d369724d9f854a29258e5cc0063b7e.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-microcosm-cc-bluemonday): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 012ed0429c..117742dc07 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -444,6 +444,30 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-microcosm-cc-bluemonday
+ (package
+ (name "go-github-com-microcosm-cc-bluemonday")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/microcosm-cc/bluemonday")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/microcosm-cc/bluemonday"))
+ (propagated-inputs
+ (list go-github-com-chris-ramon-douceur
+ go-golang-org-x-net))
+ (home-page "https://github.com/microcosm-cc/bluemonday/")
+ (synopsis "HTML sanitizer")
+ (description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
+ (license license:bsd-3)))
+
(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 03a96970ec..8e39509e06 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8902,30 +8902,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-microcosm-cc-bluemonday
- (package
- (name "go-github-com-microcosm-cc-bluemonday")
- (version "1.0.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/microcosm-cc/bluemonday")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/microcosm-cc/bluemonday"))
- (propagated-inputs
- (list go-github-com-chris-ramon-douceur
- go-golang-org-x-net))
- (home-page "https://github.com/microcosm-cc/bluemonday/")
- (synopsis "HTML sanitizer")
- (description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
- (license license:bsd-3)))
-
(define-public go-github-com-muesli-reflow-wordwrap
(package
(name "go-github-com-muesli-reflow-wordwrap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 27/67] gnu: go-github-com-google-safehtml: Remove input labels.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c1109275de0fdb9265ac004f079d7bc43025c10c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web (go-github-com-google-safehtml): Remove labels.

Change-Id: I20f5748496988c9e64fa0783bb51507c6cfa933e
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ce95d1b467..9aa3fe8233 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -163,7 +163,8 @@ (define-public go-github-com-google-safehtml
(build-system go-build-system)
(arguments
'(#:import-path "github.com/google/safehtml"))
- (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+ (propagated-inputs
+ (list go-golang-org-x-text))
(home-page "https://github.com/google/safehtml")
(synopsis "Safe HTML for Go")
(description
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 26/67] gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2437c549cef389c663b6bf85110ff2565db67c3c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-google-safehtml): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 117742dc07..ce95d1b467 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -146,6 +147,31 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-google-safehtml
+ (package
+ (name "go-github-com-google-safehtml")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/safehtml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/google/safehtml"))
+ (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+ (home-page "https://github.com/google/safehtml")
+ (synopsis "Safe HTML for Go")
+ (description
+ "Package safehtml provides immutable string-like types which represent
+values that are guaranteed to be safe, by construction or by escaping or
+sanitization, to use in various HTML contexts and with various DOM APIs.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-context
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8e39509e06..8e6cdf3a16 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12247,31 +12247,6 @@ (define-public go-github-com-google-go-jsonnet
implementation.")
(license license:asl2.0)))
-(define-public go-github-com-google-safehtml
- (package
- (name "go-github-com-google-safehtml")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/safehtml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/google/safehtml"))
- (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
- (home-page "https://github.com/google/safehtml")
- (synopsis "Safe HTML for Go")
- (description
- "Package safehtml provides immutable string-like types which represent values
-that are guaranteed to be safe, by construction or by escaping or sanitization,
-to use in various HTML contexts and with various DOM APIs.")
- (license license:bsd-3)))
-
(define-public go-github-com-google-shlex
(package
(name "go-github-com-google-shlex")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 28/67] gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6bfd705f1a38f5307ed59b4b66da5d4e15fdccac.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-bep-golibsass): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: I514ae05a8c04eea2084cbcb7e4d84c83b6b71bb4
---
gnu/packages/golang-web.scm | 61 ++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 58 -----------------------------------
2 files changed, 60 insertions(+), 59 deletions(-)

Toggle diff (157 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9aa3fe8233..72f2a7d84c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -34,7 +35,8 @@ (define-module (gnu packages golang-web)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
- #:use-module (gnu packages golang-check))
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages web))
;;; Commentary:
;;;
@@ -95,6 +97,63 @@ (define-public go-github-com-aymerick-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-bep-golibsass
+ (package
+ (name "go-github-com-bep-golibsass")
+ (version "0.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bep/golibsass")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "libsass_src")
+ #t))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bep/golibsass/libsass"
+ #:unpack-path "github.com/bep/golibsass"
+ ;; The dev build tag modifies the build to link to system libsass
+ ;; instead of including the bundled one (which we remove.)
+ ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
+ #:build-flags '("-tags" "dev")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-bindings
+ ;; Generate bindings for system libsass, replacing the
+ ;; pre-generated bindings.
+ (lambda* (#:key inputs unpack-path #:allow-other-keys)
+ (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
+ (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src")))
+ (substitute* (string-append "src/" unpack-path "/gen/main.go")
+ (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
+ (string-append "\"" libsass-src "\""))
+ (("../../libsass_src/src/")
+ libsass-src)))
+ (invoke "go" "generate" (string-append unpack-path "/gen"))
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (if tests?
+ (invoke "go" "test" import-path "-tags" "dev"))
+ #t)))))
+ (propagated-inputs
+ (list libsass))
+ (native-inputs
+ `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
+ ("libsass-src" ,(package-source libsass))))
+ (home-page "https://github.com/bep/golibsass")
+ (synopsis "Easy to use Go bindings for LibSass")
+ (description
+ "This package provides SCSS compiler support for Go applications.")
+ (license license:expat)))
+
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8e6cdf3a16..27548f3b8e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10245,64 +10245,6 @@ (define-public go-github-com-gologme-log
additions.")
(license license:bsd-3))))
-(define-public go-github-com-bep-golibsass
- (package
- (name "go-github-com-bep-golibsass")
- (version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bep/golibsass")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "libsass_src")
- #t))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bep/golibsass/libsass"
- #:unpack-path "github.com/bep/golibsass"
- ;; The dev build tag modifies the build to link to system libsass
- ;; instead of including the bundled one (which we remove.)
- ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
- #:build-flags '("-tags" "dev")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'generate-bindings
- ;; Generate bindings for system libsass, replacing the
- ;; pre-generated bindings.
- (lambda* (#:key inputs unpack-path #:allow-other-keys)
- (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
- (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src")))
- (substitute* (string-append "src/" unpack-path "/gen/main.go")
- (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
- (string-append "\"" libsass-src "\""))
- (("../../libsass_src/src/")
- libsass-src)))
- (invoke "go" "generate" (string-append unpack-path "/gen"))
- #t))
- (replace 'check
- (lambda* (#:key tests? import-path #:allow-other-keys)
- (if tests?
- (invoke "go" "test" import-path "-tags" "dev"))
- #t)))))
- (propagated-inputs
- (list libsass))
- (native-inputs
- `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
- ("libsass-src" ,(package-source libsass))))
- (home-page "https://github.com/bep/golibsass")
- (synopsis "Easy to use Go bindings for LibSass")
- (description
- "This package provides SCSS compiler support for Go applications.")
- (license license:expat)))
-
(define-public go-github-com-hashicorp-go-syslog
(package
(name "go-github-com-hashicorp-go-syslog")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 29/67] gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
8279972270f43c4480865ee86b382aae60915911.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-gopkg-in-square-go-jose-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 72f2a7d84c..976179f44e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -683,6 +683,35 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-gopkg-in-square-go-jose-v2
+ (package
+ (name "go-gopkg-in-square-go-jose-v2")
+ (version "2.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/square/go-jose")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "gopkg.in/square/go-jose.v2"))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (native-inputs
+ (list go-github-com-google-go-cmp-cmp
+ go-github-com-stretchr-testify))
+ (home-page "https://gopkg.in/square/go-jose.v2")
+ (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
+ (description
+ "This package aims to provide an implementation of the Javascript Object
+Signing and Encryption set of standards. This includes support for JSON Web
+Encryption, JSON Web Signature, and JSON Web Token standards.")
+ (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 27548f3b8e..f2d40612cf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3222,35 +3222,6 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
-(define-public go-gopkg-in-square-go-jose-v2
- (package
- (name "go-gopkg-in-square-go-jose-v2")
- (version "2.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/square/go-jose")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "gopkg.in/square/go-jose.v2"))
- (propagated-inputs
- (list go-golang-org-x-crypto))
- (native-inputs
- (list go-github-com-google-go-cmp-cmp
- go-github-com-stretchr-testify))
- (home-page "https://gopkg.in/square/go-jose.v2")
- (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
- (description
- "This package aims to provide an implementation of the Javascript Object
-Signing and Encryption set of standards. This includes support for JSON Web
-Encryption, JSON Web Signature, and JSON Web Token standards.")
- (license license:asl2.0)))
-
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 30/67] gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4c0c9c6507f77e81341c998afb719fa5b909b955.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 976179f44e..792406ab97 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -182,6 +182,33 @@ (define-public go-github-com-chris-ramon-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-coreos-go-oidc
+ (package
+ (name "go-github-com-coreos-go-oidc")
+ (version "2.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/coreos/go-oidc"))
+ (propagated-inputs
+ (list go-github-com-pquerna-cachecontrol
+ go-golang-org-x-oauth2
+ go-gopkg-in-square-go-jose-v2))
+ (home-page "https://github.com/coreos/go-oidc")
+ (synopsis "OpenID Connect support for Go")
+ (description
+ "This package enables OpenID Connect support for the
+@code{go-golang-org-x-oauth2} package.")
+ (license license:asl2.0)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f2d40612cf..6f6244dd00 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9116,33 +9116,6 @@ (define-public go-github-com-charmbracelet-glamour
use one of our glamorous default themes.")
(license license:expat)))
-(define-public go-github-com-coreos-go-oidc
- (package
- (name "go-github-com-coreos-go-oidc")
- (version "2.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-oidc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/coreos/go-oidc"))
- (propagated-inputs
- (list go-github-com-pquerna-cachecontrol
- go-golang-org-x-oauth2
- go-gopkg-in-square-go-jose-v2))
- (home-page "https://github.com/coreos/go-oidc")
- (synopsis "OpenID Connect support for Go")
- (description
- "This package enables OpenID Connect support for the
-@code{go-golang-org-x-oauth2} package.")
- (license license:asl2.0)))
-
(define-public go-github-com-coreos-go-oidc-v3
(package
(inherit go-github-com-coreos-go-oidc)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 32/67] gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
62d813df7020ca6e53654b4698c921e10a5c2d3f.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-sdk): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0219ffb5e5..352c831e41 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -71,6 +71,34 @@ (define-public go-github-com-andybalholm-cascadia
the parse trees produced by the html package.")
(license license:bsd-2)))
+(define-public go-github-com-aws-sdk
+ (package
+ (name "go-github-com-aws-sdk")
+ (version "1.35.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go/aws"
+ #:unpack-path "github.com/aws/aws-sdk-go"))
+ (propagated-inputs
+ (list go-github-com-go-sql-driver-mysql
+ go-github-com-jmespath-go-jmespath
+ go-github-com-pkg-errors
+ go-golang-org-x-net))
+ (home-page "https://github.com/aws/aws-sdk-go")
+ (synopsis "Library to access Amazon Web Services (AWS)")
+ (description
+ "This is the official AWS SDK for the Go programming language.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f311991282..57bf34ca56 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3194,34 +3194,6 @@ (define-public go-github-com-hebcal-hebcal-go
and anniversaries.")
(license license:gpl2+))))
-(define-public go-github-com-aws-sdk
- (package
- (name "go-github-com-aws-sdk")
- (version "1.35.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go/aws"
- #:unpack-path "github.com/aws/aws-sdk-go"))
- (propagated-inputs
- (list go-github-com-go-sql-driver-mysql
- go-github-com-jmespath-go-jmespath go-github-com-pkg-errors
- go-golang-org-x-net))
- (home-page "https://github.com/aws/aws-sdk-go")
- (synopsis "Library to access Amazon Web Services (AWS)")
- (description
- "This is the official AWS SDK for the Go programming language.")
- (license license:asl2.0)))
-
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 31/67] gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f7e905ce6824379864334188893bdcdec0cab251.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (68 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 792406ab97..0219ffb5e5 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -209,6 +209,28 @@ (define-public go-github-com-coreos-go-oidc
@code{go-golang-org-x-oauth2} package.")
(license license:asl2.0)))
+(define-public go-github-com-coreos-go-oidc-v3
+ (package
+ (inherit go-github-com-coreos-go-oidc)
+ (name "go-github-com-coreos-go-oidc-v3")
+ (version "3.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
+ (arguments
+ (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
+ #:import-path "github.com/coreos/go-oidc/v3/oidc"
+ #:unpack-path "github.com/coreos/go-oidc/v3"))
+ (propagated-inputs
+ (list go-github-com-go-jose-go-jose-v3
+ go-golang-org-x-oauth2))))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6f6244dd00..f311991282 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9116,28 +9116,6 @@ (define-public go-github-com-charmbracelet-glamour
use one of our glamorous default themes.")
(license license:expat)))
-(define-public go-github-com-coreos-go-oidc-v3
- (package
- (inherit go-github-com-coreos-go-oidc)
- (name "go-github-com-coreos-go-oidc-v3")
- (version "3.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-oidc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
- (arguments
- (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
- #:import-path "github.com/coreos/go-oidc/v3/oidc"
- #:unpack-path "github.com/coreos/go-oidc/v3"))
- (propagated-inputs
- (list go-github-com-go-jose-go-jose-v3
- go-golang-org-x-oauth2))))
-
(define-public go-github-com-coreos-go-semver
(package
(name "go-github-com-coreos-go-semver")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 33/67] gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
38c9dbee897e629b1a4115c820da9b6e4457c0a4.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-valyala-fasthttp): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (112 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 352c831e41..f59415452f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -760,6 +761,46 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-github-com-valyala-fasthttp
+ (package
+ (name "go-github-com-valyala-fasthttp")
+ (version "1.39.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/valyala/fasthttp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/valyala/fasthttp"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; Tests hang forever with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (propagated-inputs
+ (list go-github-com-andybalholm-brotli
+ go-github-com-klauspost-compress
+ go-github-com-valyala-bytebufferpool
+ go-github-com-valyala-tcplisten
+ go-golang-org-x-crypto
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/valyala/fasthttp")
+ (synopsis "Provides fast HTTP server and client API")
+ (description
+ "This package provides a Go module @code{fasthttp} which may be used as
+replacement for native @code{net/http} module.")
+ (license license:expat)))
+
(define-public go-gopkg-in-square-go-jose-v2
(package
(name "go-gopkg-in-square-go-jose-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 57bf34ca56..3122a2f54a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11041,46 +11041,6 @@ (define-public go-github-com-valyala-bytebufferpool
anti-fragmentation protection.")
(license license:expat)))
-(define-public go-github-com-valyala-fasthttp
- (package
- (name "go-github-com-valyala-fasthttp")
- (version "1.39.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/valyala/fasthttp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/valyala/fasthttp"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; Tests hang forever with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (propagated-inputs
- (list go-golang-org-x-sys
- go-golang-org-x-net
- go-golang-org-x-crypto
- go-github-com-valyala-tcplisten
- go-github-com-valyala-bytebufferpool
- go-github-com-klauspost-compress
- go-github-com-andybalholm-brotli))
- (home-page "https://github.com/valyala/fasthttp")
- (synopsis "Provides fast HTTP server and client API")
- (description
- "This package provides a Go module @code{fasthttp} which may be used as
-replacement for native @code{net/http} module.")
- (license license:expat)))
-
(define-public go-github-com-valyala-tcplisten
(package
(name "go-github-com-valyala-tcplisten")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 34/67] gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2870fefbdd11a63e18fbc58e256cfceb2a0f718b.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-go-chi-chi-v5): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (90 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f59415452f..2570be62f7 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,17 +1,17 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
-;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -284,6 +284,29 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-go-chi-chi-v5
+ (package
+ (name "go-github-com-go-chi-chi-v5")
+ (version "5.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-chi/chi")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/go-chi/chi/v5"))
+ (home-page "https://github.com/go-chi/chi")
+ (synopsis "Composable router for HTTP services written in Go")
+ (description
+ "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
+decompose request handling into many smaller layers.")
+ (license license:expat)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3122a2f54a..7c0dc2af4c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11854,29 +11854,6 @@ (define-public go-github-com-dreamacro-go-shadowsocks2
@end itemize")
(license license:asl2.0)))
-(define-public go-github-com-go-chi-chi-v5
- (package
- (name "go-github-com-go-chi-chi-v5")
- (version "5.0.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-chi/chi")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/go-chi/chi/v5"))
- (home-page "https://github.com/go-chi/chi")
- (synopsis "Composable router for HTTP services written in Go")
- (description
- "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
-decompose request handling into many smaller layers.")
- (license license:expat)))
-
(define-public go-sigs-k8s-io-yaml
(package
(name "go-sigs-k8s-io-yaml")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 35/67] gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
014e68fd752161374e0f966017d977ec8763226a.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-julienschmidt-httprouter): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

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

Toggle diff (93 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 2570be62f7..c501f55685 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,9 +6,9 @@
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
@@ -631,6 +631,29 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-julienschmidt-httprouter
+ (package
+ (name "go-github-com-julienschmidt-httprouter")
+ (version "1.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/julienschmidt/httprouter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/julienschmidt/httprouter"))
+ (home-page "https://github.com/julienschmidt/httprouter")
+ (synopsis "High performance HTTP request router")
+ (description
+ "Package @code{httprouter} is a trie based high performance HTTP request
+router.")
+ (license license:bsd-3)))
+
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7c0dc2af4c..d9084b296b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9338,29 +9338,6 @@ (define-public go-github-com-juju-ansiterm
for color and styles.")
(license license:lgpl3)))
-(define-public go-github-com-julienschmidt-httprouter
- (package
- (name "go-github-com-julienschmidt-httprouter")
- (version "1.3.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/julienschmidt/httprouter")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/julienschmidt/httprouter"))
- (home-page "https://github.com/julienschmidt/httprouter")
- (synopsis "High performance HTTP request router")
- (description
- "Package @code{httprouter} is a trie based high performance HTTP request
-router.")
- (license license:bsd-3)))
-
(define-public go-github-com-kevinburke-ssh-config
(package
(name "go-github-com-kevinburke-ssh-config")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 553095cb75..6808bcd597 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -35,6 +35,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages hardware)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 40/67] gnu: go-github-com-francoispqt-gojay: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
76c788921bd43b7bd2b313ea524479046aa54e9c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-francoispqt-gojay):
[propagated-inputs]: Swap to [native-inputs].

Change-Id: Ie83ea13685036b2688f668cde8bbb831ba5cd602
---
gnu/packages/golang-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 2790e2b5aa..59312f791a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -326,7 +326,7 @@ (define-public go-github-com-francoispqt-gojay
(build-system go-build-system)
(arguments
'(#:import-path "github.com/francoispqt/gojay"))
- (propagated-inputs
+ (native-inputs
(list go-github-com-stretchr-testify))
(synopsis "JSON encoder/decoder with powerful stream API for Golang")
(description "GoJay is a performant JSON encoder/decoder for Golang. It has
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 41/67] gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c92fcbaf34a11035cf69fee91c850202248b6775.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-goccy-go-json): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 59312f791a..e92e04979e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
@@ -358,6 +359,27 @@ (define-public go-github-com-go-chi-chi-v5
decompose request handling into many smaller layers.")
(license license:expat)))
+(define-public go-github-com-goccy-go-json
+ (package
+ (name "go-github-com-goccy-go-json")
+ (version "0.9.10")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/goccy/go-json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/goccy/go-json"))
+ (home-page "https://github.com/goccy/go-json")
+ (synopsis "JSON encoder/decoder in Go")
+ (description "Fast JSON encoder/decoder compatible with encoding/json for Go.")
+ (license license:expat)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d026d9c056..e47b8663d7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4002,28 +4002,6 @@ (define-public go-github-com-burntsushi-toml
is similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-goccy-go-json
- (package
- (name "go-github-com-goccy-go-json")
- (version "0.9.10")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/goccy/go-json")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/goccy/go-json"))
- (home-page "https://github.com/goccy/go-json")
- (synopsis "JSON encoder/decoder in Go")
- (description
- "Fast JSON encoder/decoder compatible with encoding/json for Go.")
- (license license:expat)))
-
(define-public go-github-com-getsentry-raven-go
(let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 42/67] gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
69c2c52608a484520ab1ddd40e383f7089440248.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jmespath-go-jmespath): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e92e04979e..9f7b0e39dc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -704,6 +704,33 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-jmespath-go-jmespath
+ (package
+ (name "go-github-com-jmespath-go-jmespath")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jmespath/go-jmespath")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jmespath/go-jmespath"))
+ (native-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/jmespath/go-jmespath")
+ (synopsis "Golang implementation of JMESPath")
+ (description
+ "This package implements JMESPath, a query language for JSON. It
+transforms one JSON document into another through a JMESPath expression.")
+ (license license:asl2.0)))
+
(define-public go-github-com-julienschmidt-httprouter
(package
(name "go-github-com-julienschmidt-httprouter")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e47b8663d7..b5eb2b2c42 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8699,33 +8699,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-jmespath-go-jmespath
- (package
- (name "go-github-com-jmespath-go-jmespath")
- (version "0.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jmespath/go-jmespath")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jmespath/go-jmespath"))
- (native-inputs
- (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib
- go-gopkg-in-yaml-v2))
- (home-page "https://github.com/jmespath/go-jmespath")
- (synopsis "Golang implementation of JMESPath")
- (description
- "This package implements JMESPath, a query language for JSON. It
-transforms one JSON document into another through a JMESPath expression.")
- (license license:asl2.0)))
-
(define-public go-github-com-muesli-reflow-wordwrap
(package
(name "go-github-com-muesli-reflow-wordwrap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 43/67] gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1293d19ab2f8c30358d6aee46e9e60aa42bb47b1.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-smithy-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9f7b0e39dc..c23e6df581 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -104,6 +104,30 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-smithy-go
+ (package
+ (name "go-github-com-aws-smithy-go")
+ (version "1.13.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/smithy-go")
+ (commit "v1.13.5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/smithy-go"))
+ (propagated-inputs
+ (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+ (home-page "https://github.com/aws/smithy-go")
+ (synopsis "Smithy code generators for Go")
+ (description
+ "Package smithy provides the core components for a Smithy SDK.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b5eb2b2c42..b4c2eff192 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,30 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-smithy-go
- (package
- (name "go-github-com-aws-smithy-go")
- (version "1.13.5")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/smithy-go")
- (commit "v1.13.5")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/smithy-go"))
- (propagated-inputs
- (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
- (home-page "https://github.com/aws/smithy-go")
- (synopsis "Smithy code generators for Go")
- (description
- "Package smithy provides the core components for a Smithy SDK.")
- (license license:asl2.0)))
-
(define-public go-github-com-aws-aws-sdk-go-v2
(package
(name "go-github-com-aws-aws-sdk-go-v2")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 44/67] gnu: go-github-com-aws-smithy-go: Adjust description.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
633686973e0ec4c695ffe6031a39890e27f5d0e7.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-aws-smithy-go):[description]
Add link to Smithy.

Change-Id: I3c913db5940dc97fb3fa8874fd8b1bf9baaf4a59
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c23e6df581..ae9ffd3fd2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -123,7 +123,8 @@ (define-public go-github-com-aws-smithy-go
(propagated-inputs
(list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
(home-page "https://github.com/aws/smithy-go")
- (synopsis "Smithy code generators for Go")
+ (synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators
+for Go")
(description
"Package smithy provides the core components for a Smithy SDK.")
(license license:asl2.0)))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 45/67] gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6612db395ddd7608ab3df8d746b99379cf45ac15.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/version-control.scm: Add (gnu packages golang-web) module.

Change-Id: I6e980749d9f9c1373adfc717b0195a1b8c32d6af
---
gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
gnu/packages/version-control.scm | 1 +
3 files changed, 27 insertions(+), 25 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ae9ffd3fd2..1542c409fe 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -104,6 +104,32 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-aws-sdk-go-v2
+ (package
+ (name "go-github-com-aws-aws-sdk-go-v2")
+ (version "1.17.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go-v2")
+ (commit "v1.17.3")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go
+ go-github-com-google-go-cmp-cmp
+ go-github-com-jmespath-go-jmespath))
+ (home-page "https://github.com/aws/aws-sdk-go-v2")
+ (synopsis "AWS SDK for Go v2")
+ (description
+ "Package sdk is the official AWS SDK v2 for the Go programming language.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b4c2eff192..a416c00a12 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,31 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2
- (package
- (name "go-github-com-aws-aws-sdk-go-v2")
- (version "1.17.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go-v2")
- (commit "v1.17.3")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-jmespath-go-jmespath
- go-github-com-google-go-cmp-cmp
- go-github-com-aws-smithy-go))
- (home-page "https://github.com/aws/aws-sdk-go-v2")
- (synopsis "AWS SDK for Go v2")
- (description
- "Package sdk is the official AWS SDK v2 for the Go programming language.")
- (license license:asl2.0)))
-
(define-public go-github-com-aws-aws-sdk-go-v2-config
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 76fa8ef5d0..5f60c4400c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -105,6 +105,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-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 46/67] gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0b4db0886ef316b9a2433a262ee7e60b1b09b082.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (84 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1542c409fe..7ecdcbd8b5 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
@@ -104,6 +105,33 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not
+;; in use anywhere. Keep it here for the farther review.
+(define-public go-github-com-aws-aws-sdk-go
+ (package
+ (name "go-github-com-aws-aws-sdk-go")
+ (version "1.36.18")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ (list go-github-com-jmespath-go-jmespath))
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go"
+ #:phases %standard-phases))
+ (synopsis "The official AWS SDK for the Go programming language")
+ (description
+ "The official AWS SDK for the Go programming language.")
+ (home-page "https://github.com/aws/aws-sdk-go")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-aws-sdk-go-v2
(package
(name "go-github-com-aws-aws-sdk-go-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a416c00a12..7bcfb86d5c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11423,31 +11423,6 @@ (define-public go-github-com-mtibben-androiddnsfix
(define-public go-github-com-androiddnsfix
(deprecated-package "go-github-com-androiddnsfix" go-github-com-mtibben-androiddnsfix))
-(define-public go-github-com-aws-aws-sdk-go
- (package
- (name "go-github-com-aws-aws-sdk-go")
- (version "1.36.18")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-github-com-jmespath-go-jmespath))
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go"
- #:phases %standard-phases))
- (synopsis "The official AWS SDK for the Go programming language")
- (description
- "The official AWS SDK for the Go programming language.")
- (home-page "https://github.com/aws/aws-sdk-go")
- (license license:asl2.0)))
-
(define-public go-gopkg-in-ini
(package
(name "go-gopkg-in-ini")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 47/67] gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
47c60deec09a478a058aa6a8df6d770185ad9091.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (47 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7ecdcbd8b5..fde9a89ea3 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -158,6 +158,18 @@ (define-public go-github-com-aws-aws-sdk-go-v2
"Package sdk is the official AWS SDK v2 for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-aws-sdk-go-v2-config
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-config")
+ (version "1.18.5")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp-cmp
+ go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7bcfb86d5c..28a421bf64 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,17 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-config
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-config")
- (version "1.18.5")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-google-go-cmp-cmp
- go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 48/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d3345c5e8fe4b66f8348e43942bd63decbef7709.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index fde9a89ea3..bfda5ffa31 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -170,6 +170,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
(list go-github-com-google-go-cmp-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
+ (version "1.44.161")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 28a421bf64..6642df7e14 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
- (version "1.44.161")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 49/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a8ed28f009209cffbdfe2fdde3fc3ef8d3848f3a.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index bfda5ffa31..5dd73bd4db 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -181,6 +181,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
+ (version "1.11.27")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6642df7e14..0572f58afd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
- (version "1.11.27")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 50/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4db28cfaa70deefed1d53e4e9ce6b904e8f2e5d4.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5dd73bd4db..4bc9c944cb 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -192,6 +192,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
+ (version "1.13.10")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0572f58afd..407c97625b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
- (version "1.13.10")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 54/67] gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ddf55ee46aba63c6470d7781a93b05ef36ad856d.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-nwidger-jsoncolor): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (85 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 616a14fdf1..96873f020c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
+;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -934,6 +935,32 @@ (define-public go-github-com-microcosm-cc-bluemonday
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-nwidger-jsoncolor
+ (package
+ (name "go-github-com-nwidger-jsoncolor")
+ (version "0.3.0")
+ (home-page "https://github.com/nwidger/jsoncolor")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/nwidger/jsoncolor"))
+ (native-inputs
+ (list go-github-com-fatih-color))
+ (synopsis "Colorized JSON marshalling and encoding")
+ (description
+ "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s
+@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type
+which produce colorized output using github.com/fatih/color.")
+ (license license:expat)))
+
(define-public go-github-com-opentracing-opentracing-go
(package
(name "go-github-com-opentracing-opentracing-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1c17b376a3..c9eb70cf1f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8786,33 +8786,6 @@ (define-public go-github-com-muesli-termenv
escape sequences and color conversions.")
(license license:expat)))
-(define-public go-github-com-nwidger-jsoncolor
- (package
- (name "go-github-com-nwidger-jsoncolor")
- (version "0.3.0")
- (home-page "https://github.com/nwidger/jsoncolor")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/nwidger/jsoncolor"))
- (native-inputs
- (list go-github-com-fatih-color))
- (synopsis "Colorized JSON marshalling and encoding")
- (description
- "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s
-@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type
-which produce colorized output using github.com/fatih/color.")
- (license license:expat)))
-
(define-public go-github-com-olekukonko-tablewriter
(package
(name "go-github-com-olekukonko-tablewriter")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 55/67] gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6a6327d5bec2c56779bd11a9a7b3308a256940f2.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: If1ba5e4d866ce74fa35ae9126c6ba4cd0b149dab
---
gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/networking.scm | 1 +
gnu/packages/uucp.scm | 1 +
4 files changed, 26 insertions(+), 24 deletions(-)

Toggle diff (103 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 96873f020c..4771657add 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
@@ -757,6 +758,29 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-hjson-hjson-go
+ (package
+ (name "go-github-com-hjson-hjson-go")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hjson/hjson-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/hjson/hjson-go"))
+ (home-page "https://hjson.org/")
+ (synopsis "Human JSON implementation for Go")
+ (description "Hjson is a syntax extension to JSON. It is intended to be
+used like a user interface for humans, to read and edit before passing the
+JSON data to the machine.")
+ (license license:expat)))
+
(define-public go-github-com-jcmturner-dnsutils-v2
(package
(name "go-github-com-jcmturner-dnsutils-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c9eb70cf1f..0e608a8eab 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9965,30 +9965,6 @@ (define-public go-github-com-hashicorp-go-syslog
(description "This package is a very simple wrapper around log/syslog")
(license license:expat)))
-(define-public go-github-com-hjson-hjson-go
- (package
- (name "go-github-com-hjson-hjson-go")
- (version "3.1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/hjson/hjson-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/hjson/hjson-go"))
- (home-page "https://hjson.org/")
- (synopsis "Human JSON implementation for Go")
- (description "Hjson is a syntax extension to JSON. It is intended to be
-used like a user interface for humans, to read and edit before passing the
-JSON data to the machine.")
- (license license:expat)))
-
(define-public go-golang-zx2c4-com-wireguard
(package
(name "go-golang-zx2c4-com-wireguard")
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 86309e4ab3..0fffea7ce4 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -122,6 +122,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index e10de59aa2..1626c90c36 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-web)
#:use-module (gnu packages texinfo)
#:use-module (guix licenses)
#:use-module (guix packages)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 56/67] gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5c021dce5b64c7df8432d2473dcb7913f93a681e.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonschema): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (105 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4771657add..c97dfa7757 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,47 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-xeipuuv-gojsonschema
+ (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonschema")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonschema")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonschema"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "schema_test.go"
+ (("\\{\"phase\": \"remote ref, " all)
+ (string-append "// " all))
+ (("\\{\"phase\": \"valid definition" all)
+ (string-append "// " all))
+ (("\\{\"phase\": \"invalid definition" all)
+ (string-append "// " all)))))))))
+ (propagated-inputs
+ (list go-github-com-xeipuuv-gojsonreference
+ go-github-com-xeipuuv-gojsonpointer
+ go-github-com-stretchr-testify))
+ (home-page "https://github.com/xeipuuv/gojsonschema")
+ (synopsis "Implementation of JSON Schema for Go")
+ (description
+ "This package provides an implementation of JSON Schema for the Go
+programming language, which supports draft-04, draft-06 and draft-07.")
+ (license license:asl2.0))))
+
(define-public go-gopkg-in-square-go-jose-v2
(package
(name "go-gopkg-in-square-go-jose-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0e608a8eab..16b13cd59e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12176,46 +12176,6 @@ (define-public go-github-com-xeipuuv-gojsonreference
programming language.")
(license license:asl2.0))))
-(define-public go-github-com-xeipuuv-gojsonschema
- (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonschema")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonschema")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonschema"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda* (#:key import-path #:allow-other-keys)
- (with-directory-excursion (string-append "src/" import-path)
- (substitute* "schema_test.go"
- (("\\{\"phase\": \"remote ref, " all)
- (string-append "// " all))
- (("\\{\"phase\": \"valid definition" all)
- (string-append "// " all))
- (("\\{\"phase\": \"invalid definition" all)
- (string-append "// " all)))))))))
- (propagated-inputs (list go-github-com-xeipuuv-gojsonreference
- go-github-com-xeipuuv-gojsonpointer
- go-github-com-stretchr-testify))
- (home-page "https://github.com/xeipuuv/gojsonschema")
- (synopsis "Implementation of JSON Schema for Go")
- (description
- "This package provides an implementation of JSON Schema for the Go
-programming language, which supports draft-04, draft-06 and draft-07.")
- (license license:asl2.0))))
-
(define-public go-github-com-niemeyer-pretty
(package
(name "go-github-com-niemeyer-pretty")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 57/67] gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
249d75d2d40439d6fccc3699f04e4cb1682e4386.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-xeipuuv-gojsonschema):
[propagated-inputs]: Move go-github-com-stretchr-testify from here ...
[native-inputs]: ... to here.

Change-Id: Id865d5821060cd847aeb9ccfc7b7a477e12f7b7b
---
gnu/packages/golang-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c97dfa7757..346ca87cc7 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1232,10 +1232,11 @@ (define-public go-github-com-xeipuuv-gojsonschema
(string-append "// " all))
(("\\{\"phase\": \"invalid definition" all)
(string-append "// " all)))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-xeipuuv-gojsonreference
- go-github-com-xeipuuv-gojsonpointer
- go-github-com-stretchr-testify))
+ go-github-com-xeipuuv-gojsonpointer))
(home-page "https://github.com/xeipuuv/gojsonschema")
(synopsis "Implementation of JSON Schema for Go")
(description
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 58/67] gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f7d4873b79bfd8e0456995286d4713e438d078af.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonpointer): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: I1c77a5a1b0e85fa57578ff29c9e3c403e4d62bc8
---
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 346ca87cc7..1f9fe0ffca 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,31 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-xeipuuv-gojsonpointer
+ (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonpointer")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonpointer")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonpointer"))
+ (home-page "https://github.com/xeipuuv/gojsonpointer")
+ (synopsis "Implementation of JSON Pointer for Go")
+ (description
+ "This package provides an implementation of JSON Pointer for the Go
+programming language.")
+ (license license:asl2.0))))
+
(define-public go-github-com-xeipuuv-gojsonschema
(let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 16b13cd59e..fb01dd4679 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12125,31 +12125,6 @@ (define-public go-github-com-go-test-deep
when comparing complex types like structures and maps.")
(license license:expat)))
-(define-public go-github-com-xeipuuv-gojsonpointer
- (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonpointer")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonpointer")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonpointer"))
- (home-page "https://github.com/xeipuuv/gojsonpointer")
- (synopsis "Implementation of JSON Pointer for Go")
- (description
- "This package provides an implementation of JSON Pointer for the Go
-programming language.")
- (license license:asl2.0))))
-
(define-public go-github-com-xeipuuv-gojsonreference
(let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 59/67] gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
89c8d3d6451b32aa1ae5853f26949961be6692aa.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonreference): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1f9fe0ffca..7f6ced049c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1227,6 +1227,33 @@ (define-public go-github-com-xeipuuv-gojsonpointer
programming language.")
(license license:asl2.0))))
+(define-public go-github-com-xeipuuv-gojsonreference
+ (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonreference")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonreference")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonreference"))
+ (propagated-inputs
+ (list go-github-com-xeipuuv-gojsonpointer))
+ (home-page "https://github.com/xeipuuv/gojsonreference")
+ (synopsis "Implementation of JSON Reference for Go")
+ (description
+ "This package provides an implementation of JSON Reference for the Go
+programming language.")
+ (license license:asl2.0))))
+
(define-public go-github-com-xeipuuv-gojsonschema
(let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index fb01dd4679..cf2c0dcfc0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12125,32 +12125,6 @@ (define-public go-github-com-go-test-deep
when comparing complex types like structures and maps.")
(license license:expat)))
-(define-public go-github-com-xeipuuv-gojsonreference
- (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonreference")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonreference")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonreference"))
- (propagated-inputs (list go-github-com-xeipuuv-gojsonpointer))
- (home-page "https://github.com/xeipuuv/gojsonreference")
- (synopsis "Implementation of JSON Reference for Go")
- (description
- "This package provides an implementation of JSON Reference for the Go
-programming language.")
- (license license:asl2.0))))
-
(define-public go-github-com-niemeyer-pretty
(package
(name "go-github-com-niemeyer-pretty")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 60/67] gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
8f0e25e1ac19be94c42fd8b152ba6d1fc9d39bf1.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-whyrusleeping-json-filter): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7f6ced049c..fbfa1049a4 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,31 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-whyrusleeping-json-filter
+ (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
+ (revision "0"))
+ (package
+ (name "go-github-com-whyrusleeping-json-filter")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/whyrusleeping/json-filter")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path
+ "github.com/whyrusleeping/json-filter"))
+ (home-page "https://github.com/whyrusleeping/json-filter")
+ (synopsis "Library to query JSON objects marshalled into map[string]interface")
+ (description "A library to query JSON objects marshalled into
+@command{map[string]interface{}}.")
+ (license license:expat))))
+
(define-public go-github-com-xeipuuv-gojsonpointer
(let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index cf2c0dcfc0..3f93f6eaee 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6508,32 +6508,6 @@ (define-public go-github-com-pmezard-go-difflib
(description "This package provides unified and context-aware diffs in Go.")
(license license:bsd-3)))
-(define-public go-github-com-whyrusleeping-json-filter
- (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
- (revision "0"))
- (package
- (name "go-github-com-whyrusleeping-json-filter")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/whyrusleeping/json-filter")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path
- "github.com/whyrusleeping/json-filter"))
- (home-page "https://github.com/whyrusleeping/json-filter")
- (synopsis "Library to query JSON objects marshalled into map[string]interface")
- (description "A library to query JSON objects marshalled into
-@command{map[string]interface{}}.")
- (license license:expat))))
-
(define-public go-github-com-whyrusleeping-progmeter
(let ((commit "f3e57218a75b913eff88d49a52c1debf9684ea04")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 61/67] gnu: go-github-com-stretchr-objx: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cefec395e67a688f8e9dc1e9b400fccbd369698f.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-stretchr-objx,
go-github-com-stretchr-testify-bootstrap): Move from here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (134 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 42e501a6e3..b74864d808 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -378,6 +378,46 @@ (define-public go-github-com-onsi-ginkgo
Gomega matcher library.")
(license license:expat)))
+(define-public go-github-com-stretchr-objx
+ (package
+ (name "go-github-com-stretchr-objx")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stretchr/objx")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/stretchr/objx"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; The tests fail when run with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib))
+ (inputs
+ (list go-github-com-stretchr-testify-bootstrap))
+ (home-page "https://github.com/stretchr/objx")
+ (synopsis "Go package for dealing with maps, slices, JSON and other data")
+ (description "This package provides a Go library for dealing with maps,
+slices, JSON and other data.")
+ (license license:expat)))
+
(define-public go-github-com-stretchr-testify
(package
(name "go-github-com-stretchr-testify")
@@ -414,6 +454,17 @@ (define-public go-github-com-stretchr-testify
@end itemize")
(license license:expat)))
+(define go-github-com-stretchr-testify-bootstrap
+ (package
+ (inherit go-github-com-stretchr-testify)
+ (arguments
+ '(#:import-path "github.com/stretchr/testify"
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (propagated-inputs
+ (list go-gopkg-in-yaml-v3))))
+
(define-public go-github-com-tdewolff-test
(package
(name "go-github-com-tdewolff-test")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3f93f6eaee..feb1295e7b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4110,58 +4110,6 @@ (define-public go-github-com-jpillora-backoff
Go.")
(license license:expat))))
-(define-public go-github-com-stretchr-objx
- (package
- (name "go-github-com-stretchr-objx")
- (version "0.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/stretchr/objx")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "vendor")))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/stretchr/objx"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; The tests fail when run with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (propagated-inputs
- (list go-github-com-davecgh-go-spew
- go-github-com-pmezard-go-difflib))
- (inputs
- (list go-github-com-stretchr-testify-bootstrap))
- (home-page "https://github.com/stretchr/objx")
- (synopsis "Go package for dealing with maps, slices, JSON and other data")
- (description "This package provides a Go library for dealing with maps,
-slices, JSON and other data.")
- (license license:expat)))
-
-(define go-github-com-stretchr-testify-bootstrap
- (package
- (inherit go-github-com-stretchr-testify)
- (arguments
- '(#:import-path "github.com/stretchr/testify"
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (propagated-inputs
- (list go-gopkg-in-yaml-v3))))
-
(define-public go-github-com-technoweenie-multipartstreamer
(package
(name "go-github-com-technoweenie-multipartstreamer")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 62/67] gnu: go-github-com-google-go-github: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f7aee223a636fe3fd70e7ee7b1828beff566b83c.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-google-go-github): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (76 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index fbfa1049a4..20c3b0f3e1 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -538,6 +538,32 @@ (define-public go-github-com-goccy-go-json
(description "Fast JSON encoder/decoder compatible with encoding/json for Go.")
(license license:expat)))
+(define-public go-github-com-google-go-github
+ (package
+ (name "go-github-com-google-go-github")
+ (version "26.1.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/go-github")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:tests? #f ;application/octet-stream instead of text/plain
+ #:import-path "github.com/google/go-github/v26/github"
+ #:unpack-path "github.com/google/go-github/v26"))
+ (native-inputs
+ (list go-github-com-google-go-querystring go-golang-org-x-crypto))
+ (home-page "https://github.com/google/go-github/")
+ (synopsis "Client library for accessing the GitHub API v3")
+ (description "@code{go-github} is a Go client library for accessing the
+GitHub API v3.")
+ (license license:bsd-3)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index feb1295e7b..3ffe569ed5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7689,32 +7689,6 @@ (define-public go-github-com-google-go-querystring
into URL query parameters.")
(license license:bsd-3))))
-(define-public go-github-com-google-go-github
- (package
- (name "go-github-com-google-go-github")
- (version "26.1.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/go-github")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi"))))
- (build-system go-build-system)
- (arguments
- `(#:tests? #f ;application/octet-stream instead of text/plain
- #:import-path "github.com/google/go-github/v26/github"
- #:unpack-path "github.com/google/go-github/v26"))
- (native-inputs
- (list go-github-com-google-go-querystring go-golang-org-x-crypto))
- (home-page "https://github.com/google/go-github/")
- (synopsis "Client library for accessing the GitHub API v3")
- (description "@code{go-github} is a Go client library for accessing the
-GitHub API v3.")
- (license license:bsd-3)))
-
(define-public go-github-com-google-renameio
(package
(name "go-github-com-google-renameio")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 36/67] gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a34ca215992cdda1cb87fe88c56d9bd3577545d2.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-emicklei-go-restful): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c501f55685..4cef7b6641 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
@@ -260,6 +261,29 @@ (define-public go-github-com-coreos-go-oidc-v3
(list go-github-com-go-jose-go-jose-v3
go-golang-org-x-oauth2))))
+(define-public go-github-com-emicklei-go-restful
+ (package
+ (name "go-github-com-emicklei-go-restful")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emicklei/go-restful")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/emicklei/go-restful"))
+ (home-page "https://github.com/emicklei/go-restful")
+ (synopsis "Build REST-style web services using Go")
+ (description "This package provides @code{go-restful}, which helps
+developers to use @code{http} methods explicitly and in a way that's
+consistent with the HTTP protocol definition.")
+ (license license:expat)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d9084b296b..f630ac3412 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4346,30 +4346,6 @@ (define-public go-github-com-blang-semver
(description "Semver is a library for Semantic versioning written in Go.")
(license license:expat))))
-(define-public go-github-com-emicklei-go-restful
- (package
- (name "go-github-com-emicklei-go-restful")
- (version "3.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emicklei/go-restful")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/emicklei/go-restful"))
- (home-page "https://github.com/emicklei/go-restful")
- (synopsis "Build REST-style web services using Go")
- (description "This package provides @code{go-restful}, which helps
-developers to use @code{http} methods explicitly and in a way that's consistent
-with the HTTP protocol definition.")
- (license license:expat)))
-
(define-public go-cloud-google-com-go-compute-metadata
(package
(name "go-cloud-google-com-go-compute-metadata")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 37/67] gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d8a0775a9e7eba4d7c8e540e5926572ac2b687ce.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tv42-httpunix): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4cef7b6641..caccb126bc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -831,6 +832,30 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-github-com-tv42-httpunix
+ (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22")
+ (revision "0"))
+ (package
+ (name "go-github-com-tv42-httpunix")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tv42/httpunix")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/tv42/httpunix"))
+ (home-page "https://github.com/tv42/httpunix")
+ (synopsis "Go library to talk HTTP over Unix domain sockets")
+ (description "This package is a Go library to talk HTTP over Unix domain
+sockets.")
+ (license license:expat))))
+
(define-public go-github-com-valyala-fasthttp
(package
(name "go-github-com-valyala-fasthttp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f630ac3412..42ba94b588 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4298,30 +4298,6 @@ (define-public go-github-com-tomnomnom-gron
absolute \"path\" to it.")
(license license:expat)))
-(define-public go-github-com-tv42-httpunix
- (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22")
- (revision "0"))
- (package
- (name "go-github-com-tv42-httpunix")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tv42/httpunix")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/tv42/httpunix"))
- (home-page "https://github.com/tv42/httpunix")
- (synopsis "Go library to talk HTTP over Unix domain sockets")
- (description "This package is a Go library to talk HTTP over Unix domain
-sockets.")
- (license license:expat))))
-
(define-public go-github-com-blang-semver
(let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 38/67] gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f64804ff1537074ce71da1beb69812cb115780ff.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-opentracing-opentracing-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index caccb126bc..d021be005f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -703,6 +704,30 @@ (define-public go-github-com-microcosm-cc-bluemonday
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-opentracing-opentracing-go
+ (package
+ (name "go-github-com-opentracing-opentracing-go")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/opentracing/opentracing-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/opentracing/opentracing-go"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/opentracing/opentracing-go")
+ (synopsis "OpenTracing API for Go")
+ (description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
+ (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 42ba94b588..c8836e4eec 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1797,30 +1797,6 @@ (define-public go-github-com-mufti1-interconv
(description "InterConv converts interfaces into any data type.")
(license license:expat))))
-(define-public go-github-com-opentracing-opentracing-go
- (package
- (name "go-github-com-opentracing-opentracing-go")
- (version "1.2.0")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/opentracing/opentracing-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/opentracing/opentracing-go"))
- (native-inputs
- (list go-github-com-stretchr-testify))
- (home-page "https://github.com/opentracing/opentracing-go")
- (synopsis "OpenTracing API for Go")
- (description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
- (license license:asl2.0)))
-
(define-public go-github-com-operatorfoundation-monolith-go
(package
(name "go-github-com-operatorfoundation-monolith-go")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:08
[PATCH 39/67] gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b3a8930bb95f0d4ea6f83f15f87abf8b951ad628.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-francoispqt-gojay): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (85 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d021be005f..2790e2b5aa 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,9 +5,9 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
@@ -310,6 +310,31 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-francoispqt-gojay
+ (package
+ (name "go-github-com-francoispqt-gojay")
+ (version "1.2.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/francoispqt/gojay")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/francoispqt/gojay"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (synopsis "JSON encoder/decoder with powerful stream API for Golang")
+ (description "GoJay is a performant JSON encoder/decoder for Golang. It has
+a simple API and doesn't use reflection. It relies on small interfaces to
+decode/encode structures and slices.")
+ (home-page "https://github.com/francoispqt/gojay")
+ (license license:expat)))
+
(define-public go-github-com-go-chi-chi-v5
(package
(name "go-github-com-go-chi-chi-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c8836e4eec..d026d9c056 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7241,31 +7241,6 @@ (define-public go-github-com-lunixbochs-vtclean
optionally preserving color.")
(license license:expat)))
-(define-public go-github-com-francoispqt-gojay
- (package
- (name "go-github-com-francoispqt-gojay")
- (version "1.2.13")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/francoispqt/gojay")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/francoispqt/gojay"))
- (propagated-inputs
- (list go-github-com-stretchr-testify))
- (synopsis "JSON encoder/decoder with powerful stream API for Golang")
- (description "GoJay is a performant JSON encoder/decoder for Golang. It has
-a simple API and doesn't use reflection. It relies on small interfaces to
-decode/encode structures and slices.")
- (home-page "https://github.com/francoispqt/gojay")
- (license license:expat)))
-
(define-public go-github-com-pkg-errors
(package
(name "go-github-com-pkg-errors")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 51/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e254aa2ac27a02c9d0f54e8e1fbbede72a944ac1.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4bc9c944cb..aadf8ac73e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -203,6 +203,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
+ (version "1.17.7")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 407c97625b..ed0b022b45 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
- (version "1.17.7")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 52/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
9ea3377926ca435b37ad9fd2fc1ad4e4602d26ed.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-s3): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index aadf8ac73e..e87634cdaa 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -181,6 +181,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-s3")
+ (version "1.30.0")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ed0b022b45..481f6cda92 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-s3")
- (version "1.30.0")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 53/67] gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0f71f3c63fa32f9c9da076bc817c3d19b48d6a6e.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-feature-s3-manager): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (44 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e87634cdaa..616a14fdf1 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -170,6 +170,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
(list go-github-com-google-go-cmp-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager")
+ (version "1.11.44")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 481f6cda92..1c17b376a3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager")
- (version "1.11.44")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public aws-vault
(package
(name "aws-vault")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 63/67] gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4dd164bfa5e0240455d0b3a2f7e0207f388c6339.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-cloud-google-com-go-compute-metadata): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/mail.scm: Add (gnu packages golang-web) module.

Change-Id: Ic97e5f4afd26376d37860fbb4758e8037e758f58
---
gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
gnu/packages/mail.scm | 1 +
3 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 20c3b0f3e1..c046e0d46a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
@@ -55,6 +56,32 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-cloud-google-com-go-compute-metadata
+ (package
+ (name "go-cloud-google-com-go-compute-metadata")
+ (version "0.81.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/googleapis/google-cloud-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "cloud.google.com/go"
+ #:import-path "cloud.google.com/go/compute/metadata"))
+ (home-page
+ "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
+ (synopsis
+ "Go wrapper for Google Compute Engine metadata service")
+ (description
+ "This package provides access to Google Compute Engine (GCE) metadata and
+API service accounts for Go.")
+ (license license:asl2.0)))
+
(define-public go-github-com-andybalholm-cascadia
(package
(name "go-github-com-andybalholm-cascadia")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3ffe569ed5..d53fa5864a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4224,33 +4224,6 @@ (define-public go-github-com-blang-semver
(description "Semver is a library for Semantic versioning written in Go.")
(license license:expat))))
-(define-public go-cloud-google-com-go-compute-metadata
- (package
- (name "go-cloud-google-com-go-compute-metadata")
- (version "0.81.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/googleapis/google-cloud-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "cloud.google.com/go"
- #:import-path "cloud.google.com/go/compute/metadata"))
- (home-page
- "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
- (synopsis
- "Go wrapper for Google Compute Engine metadata service")
- (description
- "This package provides access to Google Compute Engine (GCE) metadata and
-API service accounts for Go.")
- (license license:asl2.0)))
-
(define-public go-github-com-google-cadvisor
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
(revision "0"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9f410047e2..72ad735667 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-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages gtk)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 64/67] gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
11346e2d37a2e1acb17db29b13589805ffa247de.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-getsentry-raven-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (96 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c046e0d46a..41c8c37a0b 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -45,6 +46,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 tls)
#:use-module (gnu packages web))
;;; Commentary:
@@ -521,6 +523,35 @@ (define-public go-github-com-francoispqt-gojay
(home-page "https://github.com/francoispqt/gojay")
(license license:expat)))
+;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is
+;; now read-only. The raven-go SDK is no longer maintained and was superseded
+;; by the sentry-go
+(define-public go-github-com-getsentry-raven-go
+ (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
+ (revision "0"))
+ (package
+ (name "go-github-com-getsentry-raven-go")
+ (version (git-version "0.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/getsentry/raven-go")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/getsentry/raven-go"))
+ (propagated-inputs
+ (list go-github-com-certifi-gocertifi go-github-com-pkg-errors))
+ (home-page "https://github.com/getsentry/raven-go")
+ (synopsis "Sentry client in Go")
+ (description "This package is a Go client API for the Sentry event/error
+logging system.")
+ (license license:bsd-3))))
+
(define-public go-github-com-go-chi-chi-v5
(package
(name "go-github-com-go-chi-chi-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d53fa5864a..d4d8d352a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4002,33 +4002,6 @@ (define-public go-github-com-burntsushi-toml
is similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-getsentry-raven-go
- (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
- (revision "0"))
- (package
- (name "go-github-com-getsentry-raven-go")
- (version (git-version "0.2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/getsentry/raven-go")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/getsentry/raven-go"))
- (propagated-inputs
- (list go-github-com-certifi-gocertifi go-github-com-pkg-errors))
- (home-page "https://github.com/getsentry/raven-go")
- (synopsis "Sentry client in Go")
- (description "This package is a Go client API for the Sentry event/error
-logging system.")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 65/67] gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
db8f45d58005b6d6529117a94f7afc809e7164c0.1698627461.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-go-telegram-bot-api-telegram-bot-api): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: Ia631773394faaff150c18b074c943565f6998e1f
---
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 41c8c37a0b..7759916c35 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -575,6 +575,31 @@ (define-public go-github-com-go-chi-chi-v5
decompose request handling into many smaller layers.")
(license license:expat)))
+(define-public go-github-com-go-telegram-bot-api-telegram-bot-api
+ (package
+ (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
+ (version "4.6.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
+ (build-system go-build-system)
+ (home-page "https://go-telegram-bot-api.dev/")
+ (arguments
+ (list #:tests? #f ; Upstream tests are broken.
+ #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
+ (propagated-inputs
+ (list go-github-com-technoweenie-multipartstreamer))
+ (synopsis "Golang bindings for the Telegram Bot API")
+ (description
+ "This package provides Golang bindings for the Telegram Bot API.")
+ (license license:expat)))
+
(define-public go-github-com-goccy-go-json
(package
(name "go-github-com-goccy-go-json")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d4d8d352a5..740ddbe440 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9921,31 +9921,6 @@ (define-public go-github-com-tekwizely-go-parsing
parsers, and related tools.")
(license license:expat))))
-(define-public go-github-com-go-telegram-bot-api-telegram-bot-api
- (package
- (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
- (version "4.6.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
- (build-system go-build-system)
- (home-page "https://go-telegram-bot-api.dev/")
- (arguments
- (list #:tests? #f ; Upstream tests are broken.
- #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
- (propagated-inputs
- (list go-github-com-technoweenie-multipartstreamer))
- (synopsis "Golang bindings for the Telegram Bot API")
- (description
- "This package provides Golang bindings for the Telegram Bot API.")
- (license license:expat)))
-
(define-public go-github.com-ulikunitz-xz
(package
(name "go-github.com-ulikunitz-xz")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 67/67] teams: go-team: Extend scope.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f2842ca8ffe4d0e6ef49473ba63bb36e15b3ae91.1698627461.git.sharlatanus@gmail.com
* etc/teams.scm: Add regex for all gnu/packages/golang.* files. Add
gnu/packages/syncthing.scm.

Change-Id: I47f43ea2c42b5c86f6a07a38fbaa4170743c4203
---
etc/teams.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/etc/teams.scm b/etc/teams.scm
index 71a62bc547..0792facf06 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -298,7 +298,8 @@ (define-team ruby
(define-team go
(team 'go
#:name "Go team"
- #:scope (list "gnu/packages/golang.scm"
+ #:scope (list "gnu/packages/golang(-.+|)\\.scm$"
+ "gnu/packages/syncthing.scm"
"guix/build/go-build-system.scm"
"guix/build-system/go.scm"
"guix/import/go.scm"
--
2.41.0
S
S
Sharlatan Hellseher wrote on 30 Oct 2023 02:09
[PATCH 66/67] gnu: actionlint: Update to 1.6.26.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
51390734cd158679f9cd0fc2c7d04edd43fc5a65.1698627461.git.sharlatanus@gmail.com
* gnu/packages/check.scm (actionlint): Update to 1.6.26.
[inputs]: Swap go-github-com-robfig-cron-1.2 to go-github-com-robfig-cron

* gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): Delete variable.

Change-Id: Ie2c25254ffefb99f8808f74ae4a9d85bbbcb6437
---
gnu/packages/check.scm | 8 ++++----
gnu/packages/golang.scm | 18 ------------------
2 files changed, 4 insertions(+), 22 deletions(-)

Toggle diff (71 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index cf26196a24..fc338394bf 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -1069,7 +1069,7 @@ (define-public cpputest
(define-public actionlint
(package
(name "actionlint")
- (version "1.6.23")
+ (version "1.6.26")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1078,7 +1078,7 @@ (define-public actionlint
(file-name (git-file-name name version))
(sha256
(base32
- "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni"))))
+ "0j4ni2cryvqn3qim1r6q6sargh0wig6l4vjjwc40cgqvvkrdla04"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/rhysd/actionlint/cmd/actionlint"
@@ -1087,7 +1087,7 @@ (define-public actionlint
(inputs (list go-github-com-fatih-color
go-github-com-mattn-go-colorable
go-github-com-mattn-go-runewidth
- go-github-com-robfig-cron-1.2
+ go-github-com-robfig-cron
go-golang.org-x-sync-errgroup
go-golang.org-x-sync-semaphore
go-gopkg-in-yaml-v3))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 740ddbe440..cdf0f23a90 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7164,24 +7164,6 @@ (define-public go-github-com-robfig-cron
a cron spec parser and job runner.")
(license license:expat)))
-;; Required by actionlint. The version of `go-github-com-robfig-cron'
-;; packaged in Guix is newer and changed some error messages, causing
-;; unit tests in actionlint to fail.
-(define-public go-github-com-robfig-cron-1.2
- (package
- (inherit go-github-com-robfig-cron)
- (name "go-github-com-robfig-cron")
- (version "1.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/robfig/cron")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva"))))))
-
(define-public go-github-com-shirou-gopsutil
(let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 3 Nov 2023 20:47
(address . 66827@debbugs.gnu.org)
CAO+9K5qZBthpyuWwOD_Y07H9OUsvcEm-R=BVeCfH1Vtx9_WwKQ@mail.gmail.com
Hi Guix,

I see the QA status is pending now. After the check the part which is
holding it - it is the same one as mentioned in cover letter - there are 3
dependent packages which were failed before submitted patch series. I try
to fix them after the merge.

Thanks,
Oleg
Attachment: file
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:39
(address . 66827@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
CAO+9K5pivdrjgcSBtcdSsZOtxwFtRGek9oYKocYAC5Zc1TRqag@mail.gmail.com
Hi,

I've fixed conflict mentioned in QA by rebasing to master after fresh pull.

Unable to apply patches

Applying: gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web).
error: sha1 information is lacking or useless (gnu/packages/golang.scm).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gnu: go-github-com-hjson-hjson-go: Move to (gnu
packages golang-web).
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Sending V2 of the series

Still buildable locally:

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

/gnu/store/y3a2njyshwam18bsbfb1daamg4bkxkm5-go-gopkg-in-square-go-jose-v2-2.6.0
/gnu/store/7xzmkzr4ph0c3kkb4dci3yiri70scqbg-go-github-com-xeipuuv-gojsonschema-0.0.0-0.6b67b3f
/gnu/store/bjqlxk15a5h1s11j5h14arbqmd54638x-go-github-com-xeipuuv-gojsonreference-0.0.0-0.bd5ef7b
/gnu/store/lqwjwz5mrs5vdcfap9n0qyzf3cdls9s2-go-github-com-xeipuuv-gojsonpointer-0.0.0-0.4e3ac27
/gnu/store/6yn73zn1q0xb0qkqd21qd8vy8r7dyyrd-go-github-com-whyrusleeping-json-filter-0.0.0-0.ff25329
/gnu/store/hrdypaif9m42wshgn7l6hb0gsz3k62x0-go-github-com-valyala-fasthttp-1.39.0
/gnu/store/lnr121a2ag8njx02h023xf5vwvyxxkaj-go-github-com-tv42-httpunix-0.0.0-0.2ba4b9c
/gnu/store/8f5ywnxy7ijcgk1ii6xphqr0b84c4jmg-go-github-com-tdewolff-parse-v2-2.6.6
/gnu/store/1mdyppxxx4z3fd276kzf8xn1cnnb42k1-go-github-com-tdewolff-minify-v2-2.12.7
/gnu/store/nm69wcan5ydc1pl5a9x0rnq5nzm02nax-go-github-com-sourcegraph-jsonrpc2-0.1.0
/gnu/store/k2zfsrqzxbf9lg44wwimx6ph83h40vap-go-github-com-puerkitobio-goquery-1.7.0
/gnu/store/zvr2jw8027cj80hwvv5ifbqnnbwjhnws-go-github-com-opentracing-opentracing-go-1.2.0
/gnu/store/aqvwqcsvmvaz2bqwl8phbh856kj7nvb5-go-github-com-nwidger-jsoncolor-0.3.0
/gnu/store/9jgla4b8pvaa88fdl34rr8268xk0zbgr-go-github-com-microcosm-cc-bluemonday-1.0.3
/gnu/store/3bvbddskg8a1ls8m0m0x18i3mr47ywpx-go-github-com-julienschmidt-httprouter-1.3.0
/gnu/store/wxcjh073dcrz9z0x0vsknl61i2ffa18d-go-github-com-jmespath-go-jmespath-0.4.0
/gnu/store/6xhgag2dp7d452k8c976zb1afnxab093-go-github-com-jcmturner-gokrb5-v8-8.4.2
/gnu/store/rwx7j8iafizn3apxpgfaqy4mbhh5pvz5-go-github-com-jcmturner-goidentity-v6-6.0.1
/gnu/store/rj87yi7s0z5z4br61d2zrc5vwvpikh1h-go-github-com-jcmturner-dnsutils-v2-2.0.0
/gnu/store/nd26m97i3vhfxnwb6nshjk40i5ph4znj-go-github-com-hjson-hjson-go-3.1.0
/gnu/store/bvwsf51gdwss9gcilcqsx9ghlgqazayq-go-github-com-gorilla-websocket-1.5.0
/gnu/store/6xyakwdn2sq7i9q1lq9z3dmxcmhqz8ja-go-github-com-gorilla-sessions-1.2.1
/gnu/store/zhd46az905cl15kk89q0maw86bf3s5f5-go-github-com-gorilla-securecookie-1.1.1
/gnu/store/xani16icyll1k323may8mvgwqh0rwr20-go-github-com-gorilla-mux-1.8.0
/gnu/store/gkdmng46jgwxcqlgb2nj84gcymlh14nc-go-github-com-gorilla-handlers-1.5.1
/gnu/store/2dsy2mznxib6ay1vhng6hq4bpfhayi2b-go-github-com-gorilla-css-1.0.0
/gnu/store/9swch7kxxn9f2h50xds047mf328abjp1-go-github-com-gorilla-csrf-1.7.0
/gnu/store/3w9z5icf5j51zkdwv0d46bkwqw9kmy0y-go-github-com-gorilla-context-0.0.0-0.08b5f42
/gnu/store/1z1343fkq402gf441dk8ng2m768lk440-go-github-com-google-safehtml-0.1.0
/gnu/store/2yxy2qbpar2kq3mhih4grwyin6d6jpj6-go-github-com-google-go-github-26.1.3
/gnu/store/jcxldlis745ikndg1yf6bhnzq1ivsdxn-go-github-com-goccy-go-json-0.9.10
/gnu/store/jjp0s9mi9a7l0bwzb6vyn7d3wm8k4xg6-go-github-com-go-telegram-bot-api-telegram-bot-api-4.6.4
/gnu/store/lb2142b9ww9qx60599pnjn7w8j10rdlr-go-github-com-go-chi-chi-v5-5.0.7
/gnu/store/d4z1pz3nswzm60xccskpip2ql6zcm179-go-github-com-getsentry-raven-go-0.2.0-0.5c24d51
/gnu/store/zyw2z3nqrjw4ncklm78v0fmmbdsnwmdg-go-github-com-francoispqt-gojay-1.2.13
/gnu/store/9jn653rizil3n4klhvf1azfmqbdgnv0c-go-github-com-felixge-httpsnoop-1.0.1
/gnu/store/c506g0i9jyjb0sir401292rws4md8w65-go-github-com-emicklei-go-restful-3.4.0
/gnu/store/pkbn07131fh1wd944dannq1ybhzrh5c8-go-github-com-coreos-go-oidc-v3-3.6.0
/gnu/store/ljhsalwrrn0blaj87d0ni1cn28vg8lkg-go-github-com-coreos-go-oidc-2.2.1
/gnu/store/70lwzp46qnpgkx64x1qvwwswhavxxpy0-go-github-com-chris-ramon-douceur-0.2.0
/gnu/store/s7fxah4mgzr20a171p12slb10xzwplqn-go-github-com-bep-golibsass-0.7.0
/gnu/store/fqidgpzlv2p53clq6swx5gs6klj7x4d0-go-github-com-aymerick-douceur-0.2.0
/gnu/store/p2m82l86s24ldkrymhmnizvzq8izmy7f-go-github-com-aws-smithy-go-1.13.5
/gnu/store/7848kpqs3cmmk0s6wjlvlh6zkbsahk2j-go-github-com-aws-aws-sdk-go-v2-service-sts-1.17.7
/gnu/store/iv5ja72dzcgijj10sfhqlp6m9n60bdvq-go-github-com-aws-aws-sdk-go-v2-service-ssooidc-1.13.10
/gnu/store/ggrw8nwi6zwssi37ak9sy6zsrfcjzaqj-go-github-com-aws-aws-sdk-go-v2-service-sso-1.11.27
/gnu/store/8xsf58y9b38vbaspar74yw7nkj90x19x-go-github-com-aws-aws-sdk-go-v2-service-s3-1.30.0
/gnu/store/w99fa8yghdbpjvmpf88yz9i2xiyyq436-go-github-com-aws-aws-sdk-go-v2-service-iam-1.44.161
/gnu/store/n4gxabd1hsjpb11mwfi0n3dzw0wfas86-go-github-com-aws-aws-sdk-go-v2-feature-s3-manager-1.11.44
/gnu/store/dm39p6gw2p8ji67k14wmsm1pw3fjaqy5-go-github-com-aws-aws-sdk-go-v2-config-1.18.5
/gnu/store/zszbl56fshcc2hiz7bcjhw39j9g0mi8b-go-github-com-aws-aws-sdk-go-v2-1.17.3
/gnu/store/gfkmh8ka75j8fvs3q6vkbz7nz4z4q5ad-go-github-com-aws-aws-sdk-go-1.36.18
/gnu/store/j8rakyd65vqbhaw2kvnd10yhfv5yj8wz-go-github-com-aws-sdk-1.35.2
/gnu/store/kj72vci6aj4bxhh18501nq4ygx2yhwif-go-github-com-andybalholm-cascadia-1.3.1
/gnu/store/lqwxq7dfh80ndjnmrm8l0l3pbvbvfwfi-go-cloud-google-com-go-compute-metadata-0.81.0


--
… ??? ????? - ???????????? ?????????????? ?????? ??????? ????????
????? ????? ????? ? ??? ??????, ??????????? ????? ???????, ??
?????????? ?? ? ????????? ??????? ????? ? ?????????????????.
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-web.scm scope.
---
gnu/local.mk | 1 +
gnu/packages/golang-web.scm | 39 +++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
create mode 100644 gnu/packages/golang-web.scm

Toggle diff (61 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index a381d28b83..52b5a7ef3e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -303,6 +303,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
%D%/packages/golang-check.scm \
+ %D%/packages/golang-web.scm \
%D%/packages/gperf.scm \
%D%/packages/gpodder.scm \
%D%/packages/gps.scm \
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
new file mode 100644
index 0000000000..feb2854d9c
--- /dev/null
+++ b/gnu/packages/golang-web.scm
@@ -0,0 +1,39 @@
+;;; 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-web)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix build-system go)
+ #:use-module (guix git-download)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages golang))
+
+;;; Commentary:
+;;;
+;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON,
+;;; Web-framework, REST-API or similar functionality.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;

base-commit: 19fe24c5b978a16cbca3cddbfa3ab9d1ee2c68f2
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 02/67] gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3b6200738d7a91daa1d1c716ec04b3793fe0e2d2.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-mux): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada
---
gnu/packages/finance.scm | 1 +
gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/web.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (102 lines)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 4f3415232c..71dff964d5 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -93,6 +93,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index feb2854d9c..c779600411 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,6 +34,29 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-gorilla-mux
+ (package
+ (name "go-github-com-gorilla-mux")
+ (version "1.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/mux")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/mux"))
+ (home-page "https://github.com/gorilla/mux")
+ (synopsis "URL router and dispatcher for Go")
+ (description
+ "Gorilla/Mux implements a request router and dispatcher for matching
+incoming requests with their respective handler.")
+ (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 9c707e5414..f583bd53c5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4701,30 +4701,6 @@ (define-public go-github-com-gorilla-context
(description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
(license license:bsd-3))))
-(define-public go-github-com-gorilla-mux
- (package
- (name "go-github-com-gorilla-mux")
- (version "1.8.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/mux")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/mux"))
- (home-page "https://github.com/gorilla/mux")
- (synopsis "URL router and dispatcher for Go")
- (description
- "Gorilla/Mux implements a request router and dispatcher for matching
-incoming requests with their respective handler.")
- (license license:bsd-3)))
-
(define-public go-github-com-andybalholm-brotli
(package
(name "go-github-com-andybalholm-brotli")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 66d09700db..4055923fb1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -141,6 +141,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 03/67] gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
28b2fdbc101d69f8e539ef92b459ee666d355d13.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-css): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module.
* gnu/packages/golang.scm: As above...

Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f
---
gnu/packages/configuration-management.scm | 1 +
gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 23 +----------------------
3 files changed, 25 insertions(+), 22 deletions(-)

Toggle diff (96 lines)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 95a7e8615f..296f48dcd5 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages version-control)
#:use-module (gnu packages textutils)
#:use-module ((guix licenses) #:prefix license:)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c779600411..1d61a76268 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,28 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-gorilla-css
+ (package
+ (name "go-github-com-gorilla-css")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/css")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/gorilla/css/scanner"
+ #:unpack-path "github.com/gorilla/css"))
+ (home-page "https://github.com/gorilla/css/")
+ (synopsis "CSS3 tokenizer")
+ (description "This package provides a CSS3 tokenizer.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-mux
(package
(name "go-github-com-gorilla-mux")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f583bd53c5..db335858f6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -79,6 +79,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-web)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages mp3)
@@ -4655,28 +4656,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-gorilla-css
- (package
- (name "go-github-com-gorilla-css")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/css")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gorilla/css/scanner"
- #:unpack-path "github.com/gorilla/css"))
- (home-page "https://github.com/gorilla/css/")
- (synopsis "CSS3 tokenizer")
- (description "This package provides a CSS3 tokenizer.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-context
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 04/67] gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
dc03ad59f485052e1fdc1af6003b883feff31539.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aymerick-douceur): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1d61a76268..39a83990ce 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -35,6 +35,32 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-aymerick-douceur
+ (package
+ (name "go-github-com-aymerick-douceur")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aymerick/douceur/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/aymerick/douceur"))
+ (native-inputs
+ (list go-github-com-andybalholm-cascadia
+ go-github-com-gorilla-css
+ go-github-com-puerkitobio-goquery
+ go-golang-org-x-net))
+ (home-page "https://github.com/aymerick/douceur/")
+ (synopsis "CSS parser and inliner")
+ (description "This package provides a CSS parser and inliner.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index db335858f6..1b8b455aa5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9278,31 +9278,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-aymerick-douceur
- (package
- (name "go-github-com-aymerick-douceur")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aymerick/douceur/")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/aymerick/douceur"))
- (native-inputs
- (list go-github-com-puerkitobio-goquery
- go-github-com-andybalholm-cascadia go-golang-org-x-net
- go-github-com-gorilla-css))
- (home-page "https://github.com/aymerick/douceur/")
- (synopsis "CSS parser and inliner")
- (description "This package provides a CSS parser and inliner.")
- (license license:expat)))
-
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 05/67] gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c81ca177f0d03354a9a689bc6cde82bf6eb5ca8b.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-andybalholm-cascadia): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 39a83990ce..3c1abfff2c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,30 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-andybalholm-cascadia
+ (package
+ (name "go-github-com-andybalholm-cascadia")
+ (version "1.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/andybalholm/cascadia")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/andybalholm/cascadia"))
+ (native-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/andybalholm/cascadia/")
+ (synopsis "CSS selectors for HTML")
+ (description "The Cascadia package implements CSS selectors for use with
+the parse trees produced by the html package.")
+ (license license:bsd-2)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1b8b455aa5..580fe36486 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9203,30 +9203,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-andybalholm-cascadia
- (package
- (name "go-github-com-andybalholm-cascadia")
- (version "1.3.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/andybalholm/cascadia")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/andybalholm/cascadia"))
- (native-inputs
- (list go-golang-org-x-net))
- (home-page "https://github.com/andybalholm/cascadia/")
- (synopsis "CSS selectors for HTML")
- (description "The Cascadia package implements CSS selectors for use with
-the parse trees produced by the html package.")
- (license license:bsd-2)))
-
(define-public go-github-com-puerkitobio-goquery
(package
(name "go-github-com-puerkitobio-goquery")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 06/67] gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1c0bc3c6c32bd3bff602ac895832904ec802ec68.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-puerkitobio-goquery): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (81 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3c1abfff2c..8d8b4fb85c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,8 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
@@ -131,6 +133,30 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-puerkitobio-goquery
+ (package
+ (name "go-github-com-puerkitobio-goquery")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/PuerkitoBio/goquery")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/PuerkitoBio/goquery"))
+ (propagated-inputs
+ (list go-github-com-andybalholm-cascadia go-golang-org-x-net))
+ (home-page "https://github.com/PuerkitoBio/goquery")
+ (synopsis "Features similar to jQuery to the Go language")
+ (description "@code{goquery} brings a syntax and a set of features similar
+to jQuery to the Go language.")
+ (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 580fe36486..6df57cc87c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9203,30 +9203,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-puerkitobio-goquery
- (package
- (name "go-github-com-puerkitobio-goquery")
- (version "1.7.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/PuerkitoBio/goquery")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/PuerkitoBio/goquery"))
- (propagated-inputs
- (list go-github-com-andybalholm-cascadia go-golang-org-x-net))
- (home-page "https://github.com/PuerkitoBio/goquery")
- (synopsis "Features similar to jQuery to the Go language")
- (description "@code{goquery} brings a syntax and a set of features similar
-to jQuery to the Go language.")
- (license license:bsd-3)))
-
(define-public go-github-com-jmespath-go-jmespath
(package
(name "go-github-com-jmespath-go-jmespath")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 07/67] gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a1888a10cf1dfaa7c1de67a55405902e44aa7b74.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-chris-ramon-douceur): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (89 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 8d8b4fb85c..79a69bc842 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
@@ -88,6 +88,34 @@ (define-public go-github-com-aymerick-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-chris-ramon-douceur
+ (package
+ (name "go-github-com-chris-ramon-douceur")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chris-ramon/douceur")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/chris-ramon/douceur"))
+ (propagated-inputs
+ (list go-github-com-aymerick-douceur
+ go-github-com-gorilla-css))
+ (native-inputs
+ (list go-github-com-puerkitobio-goquery
+ go-github-com-andybalholm-cascadia
+ go-golang-org-x-net))
+ (home-page "https://github.com/chris-ramon/douceur/")
+ (synopsis "CSS parser and inliner")
+ (description "This package provides a CSS parser and inliner.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6df57cc87c..c34c075806 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9230,34 +9230,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-chris-ramon-douceur
- (package
- (name "go-github-com-chris-ramon-douceur")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/chris-ramon/douceur")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/chris-ramon/douceur"))
- (propagated-inputs
- (list go-github-com-aymerick-douceur
- go-github-com-gorilla-css))
- (native-inputs
- (list go-github-com-puerkitobio-goquery
- go-github-com-andybalholm-cascadia
- go-golang-org-x-net))
- (home-page "https://github.com/chris-ramon/douceur/")
- (synopsis "CSS parser and inliner")
- (description "This package provides a CSS parser and inliner.")
- (license license:expat)))
-
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 08/67] gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
66964b82695764b2acdf6ac6db948d6dba2f39fb.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-websocket): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/ipfs.scm: Add (gnu packages golang-web) module.

Change-Id: I844738ec0b178a6a1746b01659c93a20919c2736
---
gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 21 ---------------------
gnu/packages/ipfs.scm | 1 +
3 files changed, 24 insertions(+), 21 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 79a69bc842..0ca70cec38 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -161,6 +162,28 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-websocket
+ (package
+ (name "go-github-com-gorilla-websocket")
+ (version "1.5.0")
+ (home-page "https://github.com/gorilla/websocket")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/gorilla/websocket"))
+ (synopsis "Fast WebSocket implementation for Go")
+ (description "Gorilla WebSocket is a Go implementation of the WebSocket
+protocol.")
+ (license license:bsd-2)))
+
(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 c34c075806..ed65b5d978 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12646,27 +12646,6 @@ (define-public go-github-com-google-shlex
using shell-style rules for quoting and commenting.")
(license license:asl2.0)))
-(define-public go-github-com-gorilla-websocket
- (package
- (name "go-github-com-gorilla-websocket")
- (version "1.5.0")
- (home-page "https://github.com/gorilla/websocket")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gorilla/websocket"))
- (synopsis "Fast WebSocket implementation for Go")
- (description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.")
- (license license:bsd-2)))
-
(define-public go-github-com-sourcegraph-jsonrpc2
(package
(name "go-github-com-sourcegraph-jsonrpc2")
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a4c0613e40..fc66582c8a 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-web)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
#:use-module (gnu packages syncthing))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 09/67] gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
72080382764b6f970f2e9106d16e90df7d1c330e.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-sourcegraph-jsonrpc2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/databases.scm: Add (gnu packages golang-web) module.

Change-Id: Idda2e18ae5d3e19f72265bdd017eadddc25bcad9
---
gnu/packages/databases.scm | 1 +
gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
3 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (88 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 3eeee9fadf..5df8ea2bb8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -108,6 +108,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0ca70cec38..f9e7039707 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -208,6 +208,32 @@ (define-public go-github-com-puerkitobio-goquery
to jQuery to the Go language.")
(license license:bsd-3)))
+(define-public go-github-com-sourcegraph-jsonrpc2
+ (package
+ (name "go-github-com-sourcegraph-jsonrpc2")
+ (version "0.1.0")
+ (home-page "https://github.com/sourcegraph/jsonrpc2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/sourcegraph/jsonrpc2"))
+ (propagated-inputs
+ (list go-github-com-daviddengcn-go-colortext
+ go-github-com-gorilla-websocket
+ go-github-com-motemen-go-colorine))
+ (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
+ (description
+ "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
+ (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 ed65b5d978..5e7d321a2b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12646,32 +12646,6 @@ (define-public go-github-com-google-shlex
using shell-style rules for quoting and commenting.")
(license license:asl2.0)))
-(define-public go-github-com-sourcegraph-jsonrpc2
- (package
- (name "go-github-com-sourcegraph-jsonrpc2")
- (version "0.1.0")
- (home-page "https://github.com/sourcegraph/jsonrpc2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/sourcegraph/jsonrpc2"))
- (propagated-inputs
- (list
- go-github-com-daviddengcn-go-colortext
- go-github-com-motemen-go-colorine
- go-github-com-gorilla-websocket))
- (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
- (description
- "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
- (license license:expat)))
-
(define-public go-github-com-disintegration-imaging
(package
(name "go-github-com-disintegration-imaging")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 11/67] gnu: go-github-com-gorilla-handlers: Remove input labels.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3e3d255f74cfec3c26156d0acf94b5822669b3d1.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-gorilla-handlers): Remove labels.

Change-Id: I955408970a64d03823327912fdafcac5d7fbda93
---
gnu/packages/golang-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0480f648eb..3a3c5f9621 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -154,11 +154,11 @@ (define-public go-github-com-gorilla-handlers
(sha256
(base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
(build-system go-build-system)
- (propagated-inputs
- `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
(arguments
'(#:tests? #f ; Tries to download from the internet
#:import-path "github.com/gorilla/handlers"))
+ (propagated-inputs
+ (list go-github-com-felixge-httpsnoop))
(home-page "https://github.com/gorilla/handlers")
(synopsis "Middleware for Go HTTP services and web applications")
(description "A collection of useful middleware for Go HTTP services and
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 10/67] gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3525fa5dcc7a8eb369fb3996002ef1d85167d4f7.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-handlers): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: I7535bdecc681e230f4aee70115a3dea847d40e6f
---
gnu/packages/backup.scm | 1 +
gnu/packages/golang-web.scm | 28 +++++++++++++++++++++++++++-
gnu/packages/golang.scm | 26 --------------------------
3 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (99 lines)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 12c4a45b9d..8e0a782f91 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-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f9e7039707..0480f648eb 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,9 +1,10 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
@@ -139,6 +140,31 @@ (define-public go-github-com-gorilla-css
(description "This package provides a CSS3 tokenizer.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-handlers
+ (package
+ (name "go-github-com-gorilla-handlers")
+ (version "1.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/handlers")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
+ (arguments
+ '(#:tests? #f ; Tries to download from the internet
+ #:import-path "github.com/gorilla/handlers"))
+ (home-page "https://github.com/gorilla/handlers")
+ (synopsis "Middleware for Go HTTP services and web applications")
+ (description "A collection of useful middleware for Go HTTP services and
+web applications.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-mux
(package
(name "go-github-com-gorilla-mux")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5e7d321a2b..243fd2f798 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4706,32 +4706,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-handlers
- (package
- (name "go-github-com-gorilla-handlers")
- (version "1.5.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/handlers")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
- (build-system go-build-system)
- (propagated-inputs
- `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
- (arguments
- '(#:tests? #f ; Tries to download from the internet
- #:import-path "github.com/gorilla/handlers"))
- (home-page "https://github.com/gorilla/handlers")
- (synopsis "Middleware for Go HTTP services and web applications")
- (description "A collection of useful middleware for Go HTTP services
-and web applications.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-securecookie
(package
(name "go-github-com-gorilla-securecookie")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 12/67] gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
12233cc449b22de925f12ea5f8d60ea8e59e59c6.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-felixge-httpsnoop): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (73 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3a3c5f9621..c0ceb5b7ce 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -118,6 +118,30 @@ (define-public go-github-com-chris-ramon-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-felixge-httpsnoop
+ (package
+ (name "go-github-com-felixge-httpsnoop")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/felixge/httpsnoop")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/felixge/httpsnoop"))
+ (home-page "https://github.com/felixge/httpsnoop/")
+ (synopsis "Capture http related metrics")
+ (description
+ "Httpsnoop provides an easy way to capture http related
+metrics (i.e. response time, bytes written, and http status code) from your
+application's http.Handlers.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 243fd2f798..ade98626c8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4984,31 +4984,6 @@ (define-public go-github-com-spf13-viper
all types of configuration needs and formats.")
(license license:expat)))
-(define-public go-github-com-felixge-httpsnoop
- (package
- (name "go-github-com-felixge-httpsnoop")
- (version "1.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/felixge/httpsnoop")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/felixge/httpsnoop"))
- (home-page "https://github.com/felixge/httpsnoop/")
- (synopsis "Capture http related metrics")
- (description
- "Httpsnoop provides an easy way to capture http related
-metrics (i.e. response time, bytes written, and http status code) from your
-application's http.Handlers.")
- (license license:expat)))
-
(define-public go-github-com-fsnotify-fsnotify
(package
(name "go-github-com-fsnotify-fsnotify")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 13/67] gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3adebb62c1fd94df619899cfae2312ada8786262.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-securecookie): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (73 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c0ceb5b7ce..1a77e0f6f2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -212,6 +212,30 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-securecookie
+ (package
+ (name "go-github-com-gorilla-securecookie")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/securecookie")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/securecookie"))
+ (home-page "https://github.com/gorilla/securecookie")
+ (synopsis "Encodes and decodes authenticated and optionally encrypted
+cookie values")
+ (description
+ "Gorilla/securecookie encodes and decodes authenticated and optionally
+encrypted cookie values for Go web applications.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ade98626c8..3fd20ec3c0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4706,31 +4706,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-securecookie
- (package
- (name "go-github-com-gorilla-securecookie")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/securecookie")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/securecookie"))
- (home-page "https://github.com/gorilla/securecookie")
- (synopsis "Encodes and decodes authenticated and optionally encrypted
-cookie values")
- (description
- "Gorilla/securecookie encodes and decodes authenticated and optionally
-encrypted cookie values for Go web applications.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-sessions
(package
(name "go-github-com-gorilla-sessions")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 14/67] gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
568810374dcf31bc946382d435817b6e589b24e8.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-sessions): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (83 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1a77e0f6f2..971b370115 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -236,6 +237,32 @@ (define-public go-github-com-gorilla-securecookie
encrypted cookie values for Go web applications.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-sessions
+ (package
+ (name "go-github-com-gorilla-sessions")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/sessions")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/sessions"))
+ (propagated-inputs
+ (list go-github-com-gorilla-securecookie))
+ (home-page "https://github.com/gorilla/sessions")
+ (synopsis "Manage user sessions in web applications")
+ (description
+ "This package that provides infrastructure for creating and managing user
+sessions in web applications. It supports cookie and filesystem-based
+sessions, flash messages, custom backends, and more.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3fd20ec3c0..a8d35b866c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4706,31 +4706,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-sessions
- (package
- (name "go-github-com-gorilla-sessions")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/sessions")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/sessions"))
- (propagated-inputs (list go-github-com-gorilla-securecookie))
- (home-page "https://github.com/gorilla/sessions")
- (synopsis "Manage user sessions in web applications")
- (description
- "This package that provides infrastructure for creating and
-managing user sessions in web applications. It supports cookie and
-filesystem-based sessions, flash messages, custom backends, and more.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 15/67] gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
36dc0b088c82ff1882588b035c29aa49e0413174.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-gokrb5-v8): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: Ie7833a1f5712cc3899fd140741774e6b71f03967
---
gnu/packages/golang-web.scm | 52 ++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 48 ----------------------------------
2 files changed, 51 insertions(+), 49 deletions(-)

Toggle diff (131 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 971b370115..ae10a86551 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -30,7 +30,8 @@ (define-module (gnu packages golang-web)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check))
;;; Commentary:
;;;
@@ -285,6 +286,55 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-jcmturner-gokrb5-v8
+ (package
+ (name "go-github-com-jcmturner-gokrb5-v8")
+ (version "8.4.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/gokrb5")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/gokrb5/v8"
+ #:unpack-path "github.com/jcmturner/gokrb5"))
+ (propagated-inputs
+ (list go-github-com-gorilla-sessions
+ go-github-com-hashicorp-go-uuid
+ go-github-com-jcmturner-aescts-v2
+ go-github-com-jcmturner-dnsutils-v2
+ go-github-com-jcmturner-gofork
+ go-github-com-jcmturner-goidentity-v6
+ go-github-com-jcmturner-rpc-v2-mstypes
+ go-github-com-jcmturner-rpc-v2-ndr
+ go-github-com-stretchr-testify
+ go-golang-org-x-crypto
+ go-golang-org-x-net))
+ (home-page "https://github.com/jcmturner/gokrb5")
+ (synopsis "Pure Go Kerberos library for clients and services")
+ (description "This package provides a pure Go Kerberos library. It
+features:
+@itemize
+@item Kerberos libraries for custom integration
+@item Parsing Keytab files
+@item Parsing krb5.conf files
+@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami))
+@end itemize
+
+On the client side, it provides a client that can authenticate to an SPNEGO
+Kerberos authenticated web service, and the ability to change client's
+password.
+
+On the server side, the library provides a HTTP handler wrapper implements
+SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
+Microsoft AD PAC authorization data.")
+ (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 a8d35b866c..e65b8e2581 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1436,54 +1436,6 @@ (define-public go-github-com-jcmturner-gofork
arounds until issues are addressed in the official distribution.")
(license license:bsd-3)))
-(define-public go-github-com-jcmturner-gokrb5-v8
- (package
- (name "go-github-com-jcmturner-gokrb5-v8")
- (version "8.4.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/gokrb5")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/gokrb5/v8"
- #:unpack-path "github.com/jcmturner/gokrb5"))
- (propagated-inputs (list go-golang-org-x-net
- go-golang-org-x-crypto
- go-github-com-stretchr-testify
- go-github-com-jcmturner-rpc-v2-ndr
- go-github-com-jcmturner-rpc-v2-mstypes
- go-github-com-jcmturner-goidentity-v6
- go-github-com-jcmturner-gofork
- go-github-com-jcmturner-dnsutils-v2
- go-github-com-jcmturner-aescts-v2
- go-github-com-hashicorp-go-uuid
- go-github-com-gorilla-sessions))
- (home-page "https://github.com/jcmturner/gokrb5")
- (synopsis "Pure Go Kerberos library for clients and services")
- (description "This package provides a pure Go Kerberos library. It
-features:
-@itemize
-@item Kerberos libraries for custom integration
-@item Parsing Keytab files
-@item Parsing krb5.conf files
-@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami))
-@end itemize
-
-On the client side, it provides a client that can authenticate to an SPNEGO
-Kerberos authenticated web service, and the ability to change client's
-password.
-
-On the server side, the library provides a HTTP handler wrapper implements
-SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
-Microsoft AD PAC authorization data.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-rpc
(package
(name "go-github-com-jcmturner-rpc")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 16/67] gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
fd324b28b98273318a219fba6043834bb4c10724.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-gokrb5-v8)
[propagated-inputs]: go-github-com-stretchr-testify move from here ...
[native-inputs]: ... to here.

Change-Id: I93be99c60c15ba7861dd909e8856c800f8cf8314
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ae10a86551..580877f8fe 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -303,6 +303,8 @@ (define-public go-github-com-jcmturner-gokrb5-v8
(arguments
'(#:import-path "github.com/jcmturner/gokrb5/v8"
#:unpack-path "github.com/jcmturner/gokrb5"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-gorilla-sessions
go-github-com-hashicorp-go-uuid
@@ -312,7 +314,6 @@ (define-public go-github-com-jcmturner-gokrb5-v8
go-github-com-jcmturner-goidentity-v6
go-github-com-jcmturner-rpc-v2-mstypes
go-github-com-jcmturner-rpc-v2-ndr
- go-github-com-stretchr-testify
go-golang-org-x-crypto
go-golang-org-x-net))
(home-page "https://github.com/jcmturner/gokrb5")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 17/67] gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5444b4a7931294533af87b59ca63b5c08411238a.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-dnsutils-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (79 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 580877f8fe..9b2bcd7cbd 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -286,6 +286,34 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-jcmturner-dnsutils-v2
+ (package
+ (name "go-github-com-jcmturner-dnsutils-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/dnsutils")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/dnsutils/v2"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/jcmturner/dnsutils")
+ (synopsis "Go library with DNS utils")
+ (description
+ "The dnsutils package provides a Go function to return a map of Service
+Records (SRV) in the order they should be used for a given service, protocol
+and name. The order is determined by the records' priority and randomized
+selection based on their relative weighting. This package is useful for
+network applications that require accessing services using SRV records.")
+ (license license:asl2.0)))
+
(define-public go-github-com-jcmturner-gokrb5-v8
(package
(name "go-github-com-jcmturner-gokrb5-v8")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e65b8e2581..20d3c378c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1362,33 +1362,6 @@ (define-public go-github-com-jcmturner-aescts-v2
encryption and decryption methods.")
(license license:asl2.0)))
-(define-public go-github-com-jcmturner-dnsutils-v2
- (package
- (name "go-github-com-jcmturner-dnsutils-v2")
- (version "2.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/dnsutils")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/dnsutils/v2"))
- (propagated-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/jcmturner/dnsutils")
- (synopsis "Go library with DNS utils")
- (description
- "The dnsutils package provides a Go function to return a map of Service
-Records (SRV) in the order they should be used for a given service, protocol
-and name. The order is determined by the records' priority and randomized
-selection based on their relative weighting. This package is useful for
-network applications that require accessing services using SRV records.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-goidentity-v6
(package
(name "go-github-com-jcmturner-goidentity-v6")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 18/67] gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
593ccc0cc8adc311fff05535d7dad57a6f4b4bc8.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-dnsutils-v2):
Swap propagated-inputs to native-inputs.

Change-Id: I1d02b45559214d72828a78437766cf7c1e06f1b0
---
gnu/packages/golang-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9b2bcd7cbd..6a832291ab 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -302,7 +302,7 @@ (define-public go-github-com-jcmturner-dnsutils-v2
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jcmturner/dnsutils/v2"))
- (propagated-inputs
+ (native-inputs
(list go-github-com-stretchr-testify))
(home-page "https://github.com/jcmturner/dnsutils")
(synopsis "Go library with DNS utils")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 19/67] gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d663be1a54d52be58cdc2241e032890aa6ad137c.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-goidentity-v6): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 6a832291ab..751eb41b58 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -314,6 +314,30 @@ (define-public go-github-com-jcmturner-dnsutils-v2
network applications that require accessing services using SRV records.")
(license license:asl2.0)))
+(define-public go-github-com-jcmturner-goidentity-v6
+ (package
+ (name "go-github-com-jcmturner-goidentity-v6")
+ (version "6.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/goidentity")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/goidentity/v6"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
+ (home-page "https://github.com/jcmturner/goidentity")
+ (synopsis "Hold authenticated identities and their attributes")
+ (description "This package provides a standard interface for holding
+authenticated identities and their attributes.")
+ (license license:asl2.0)))
+
(define-public go-github-com-jcmturner-gokrb5-v8
(package
(name "go-github-com-jcmturner-gokrb5-v8")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 20d3c378c4..7ad906ef54 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1362,30 +1362,6 @@ (define-public go-github-com-jcmturner-aescts-v2
encryption and decryption methods.")
(license license:asl2.0)))
-(define-public go-github-com-jcmturner-goidentity-v6
- (package
- (name "go-github-com-jcmturner-goidentity-v6")
- (version "6.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/goidentity")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/goidentity/v6"))
- (propagated-inputs
- (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
- (home-page "https://github.com/jcmturner/goidentity")
- (synopsis "Hold authenticated identities and their attributes")
- (description "This package provides a standard interface for holding
-authenticated identities and their attributes.")
- (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 8 Nov 2023 01:40
[PATCH 20/67] gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e98697a41c67b235ebd31c0bfd84994f76f0ffd0.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-goidentity-v6):
[propagated-inputs]: Move go-github-com-stretchr-testify from here ...
[native-inputs]: ... to here.

Change-Id: I1e7bd72b3bf1c0879426a6a4c5b3b1de1d316069
---
gnu/packages/golang-web.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (18 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 751eb41b58..8ced6a4c6f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -330,8 +330,10 @@ (define-public go-github-com-jcmturner-goidentity-v6
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jcmturner/goidentity/v6"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
- (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
+ (list go-github-com-hashicorp-go-uuid))
(home-page "https://github.com/jcmturner/goidentity")
(synopsis "Hold authenticated identities and their attributes")
(description "This package provides a standard interface for holding
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 21/67] gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
8692e38aa82c4f70084492351814db6c328cb202.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-csrf): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 8ced6a4c6f..5be08caf2e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -144,6 +144,32 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-gorilla-csrf
+ (package
+ (name "go-github-com-gorilla-csrf")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/csrf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
+ ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
+ (arguments
+ '(#:import-path "github.com/gorilla/csrf"))
+ (home-page "https://github.com/gorilla/csrf")
+ (synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
+ (description
+ "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
+middleware for Go web applications and services.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7ad906ef54..4a7060f065 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4607,33 +4607,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-csrf
- (package
- (name "go-github-com-gorilla-csrf")
- (version "1.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/csrf")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
- (build-system go-build-system)
- (propagated-inputs
- `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
- ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
- (arguments
- '(#:import-path "github.com/gorilla/csrf"))
- (home-page "https://github.com/gorilla/csrf")
- (synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
- (description
- "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
-middleware for Go web applications and services.")
- (license license:bsd-3)))
-
(define-public go-github-com-jonboulle-clockwork
(let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:40
[PATCH 22/67] gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3f13ad9e2912f457bf9eac4973df065d983b22a7.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tdewolff-minify-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (121 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5be08caf2e..d82cac46b9 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -28,6 +29,7 @@ (define-module (gnu packages golang-web)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix build-system go)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
@@ -466,6 +468,47 @@ (define-public go-github-com-sourcegraph-jsonrpc2
"Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
(license license:expat)))
+(define-public go-github-com-tdewolff-minify-v2
+ (package
+ (name "go-github-com-tdewolff-minify-v2")
+ (version "2.12.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/minify")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tdewolff/minify/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-hash
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion
+ (format #f "src/~a/~a" import-path dir)
+ (make-file-writable "hash.go")
+ (format #t "Generating `hash.go' for ~a...~%" dir)
+ (invoke "go" "generate")))
+ '("css" "html" "svg")))))))
+ (propagated-inputs
+ (list go-github-com-tdewolff-parse-v2))
+ (native-inputs
+ (list go-github-com-tdewolff-hasher
+ go-github-com-tdewolff-test))
+ (home-page "https://go.tacodewolff.nl/minify")
+ (synopsis "Go minifiers for web formats")
+ (description
+ "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and
+an interface to implement any other minifier.")
+ (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 4a7060f065..70208b87b6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3436,46 +3436,6 @@ (define-public go-github-com-tdewolff-hasher
@code{string} to @code{uint32} mapper.")
(license license:bsd-3)))
-(define-public go-github-com-tdewolff-minify-v2
- (package
- (name "go-github-com-tdewolff-minify-v2")
- (version "2.12.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/minify")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/minify/v2"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-hash
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each
- (lambda (dir)
- (with-directory-excursion
- (format #f "src/~a/~a" import-path dir)
- (make-file-writable "hash.go")
- (format #t "Generating `hash.go' for ~a...~%" dir)
- (invoke "go" "generate")))
- '("css" "html" "svg")))))))
- (propagated-inputs
- (list go-github-com-tdewolff-parse-v2))
- (native-inputs
- (list go-github-com-tdewolff-hasher
- go-github-com-tdewolff-test))
- (home-page "https://go.tacodewolff.nl/minify")
- (synopsis "Go minifiers for web formats")
- (description
- "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and
-an interface to implement any other minifier.")
- (license license:expat)))
-
(define-public go-github-com-tdewolff-parse-v2
(package
(name "go-github-com-tdewolff-parse-v2")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 23/67] gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b9ba06ea1bf6c0420e95b263d34fa99aa9616388.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tdewolff-parse-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (99 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d82cac46b9..9e68e96baf 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -509,6 +509,44 @@ (define-public go-github-com-tdewolff-minify-v2
an interface to implement any other minifier.")
(license license:expat)))
+(define-public go-github-com-tdewolff-parse-v2
+ (package
+ (name "go-github-com-tdewolff-parse-v2")
+ (version "2.6.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/parse")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tdewolff/parse/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-hash
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion
+ (format #f "src/~a/~a" import-path dir)
+ (make-file-writable "hash.go")
+ (format #t "Generating `hash.go' for ~a...~%" dir)
+ (invoke "go" "generate")))
+ '("css" "html")))))))
+ (native-inputs
+ (list go-github-com-tdewolff-hasher
+ go-github-com-tdewolff-test))
+ (home-page "https://github.com/tdewolff/parse")
+ (synopsis "Go parsers for web formats")
+ (description
+ "This package contains several lexers and parsers written 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 70208b87b6..c4ae0091d2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3436,43 +3436,6 @@ (define-public go-github-com-tdewolff-hasher
@code{string} to @code{uint32} mapper.")
(license license:bsd-3)))
-(define-public go-github-com-tdewolff-parse-v2
- (package
- (name "go-github-com-tdewolff-parse-v2")
- (version "2.6.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/parse")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/parse/v2"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-hash
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each
- (lambda (dir)
- (with-directory-excursion
- (format #f "src/~a/~a" import-path dir)
- (make-file-writable "hash.go")
- (format #t "Generating `hash.go' for ~a...~%" dir)
- (invoke "go" "generate")))
- '("css" "html")))))))
- (native-inputs
- (list go-github-com-tdewolff-hasher
- go-github-com-tdewolff-test))
- (home-page "https://github.com/tdewolff/parse")
- (synopsis "Go parsers for web formats")
- (description
- "This package contains several lexers and parsers written in Go.")
- (license license:expat)))
-
(define-public go-github-com-tj-docopt
(package
(name "go-github-com-tj-docopt")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 24/67] gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
29b518e2564a84565c74c4d85bc1efaee757f491.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-context): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9e68e96baf..012ed0429c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -146,6 +146,32 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-gorilla-context
+ (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
+ (revision "0"))
+ (package
+ (name "go-github-com-gorilla-context")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/context")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/context"))
+ (home-page "https://github.com/gorilla/context")
+ (synopsis "Go registry for request variables")
+ (description
+ "This package provides @code{gorilla/context}, which is a general
+purpose registry for global request variables in the Go programming
+language.")
+ (license license:bsd-3))))
+
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c4ae0091d2..a3d5fb0f6b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4480,30 +4480,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-gorilla-context
- (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
- (revision "0"))
- (package
- (name "go-github-com-gorilla-context")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/context")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/context"))
- (home-page "https://github.com/gorilla/context")
- (synopsis "Go registry for request variables")
- (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
- (license license:bsd-3))))
-
(define-public go-github-com-andybalholm-brotli
(package
(name "go-github-com-andybalholm-brotli")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 25/67] gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c15d5c40f3872ef3306f3f6ab3d6acb1933969ff.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-microcosm-cc-bluemonday): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 012ed0429c..117742dc07 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -444,6 +444,30 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-microcosm-cc-bluemonday
+ (package
+ (name "go-github-com-microcosm-cc-bluemonday")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/microcosm-cc/bluemonday")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/microcosm-cc/bluemonday"))
+ (propagated-inputs
+ (list go-github-com-chris-ramon-douceur
+ go-golang-org-x-net))
+ (home-page "https://github.com/microcosm-cc/bluemonday/")
+ (synopsis "HTML sanitizer")
+ (description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
+ (license license:bsd-3)))
+
(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 a3d5fb0f6b..936e9203b3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8902,30 +8902,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-microcosm-cc-bluemonday
- (package
- (name "go-github-com-microcosm-cc-bluemonday")
- (version "1.0.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/microcosm-cc/bluemonday")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/microcosm-cc/bluemonday"))
- (propagated-inputs
- (list go-github-com-chris-ramon-douceur
- go-golang-org-x-net))
- (home-page "https://github.com/microcosm-cc/bluemonday/")
- (synopsis "HTML sanitizer")
- (description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
- (license license:bsd-3)))
-
(define-public go-github-com-muesli-reflow-wordwrap
(package
(name "go-github-com-muesli-reflow-wordwrap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 26/67] gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
64fd90fa470ad536a226ed73b1a7f4173887c75b.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-google-safehtml): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 117742dc07..ce95d1b467 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -146,6 +147,31 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-google-safehtml
+ (package
+ (name "go-github-com-google-safehtml")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/safehtml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/google/safehtml"))
+ (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+ (home-page "https://github.com/google/safehtml")
+ (synopsis "Safe HTML for Go")
+ (description
+ "Package safehtml provides immutable string-like types which represent
+values that are guaranteed to be safe, by construction or by escaping or
+sanitization, to use in various HTML contexts and with various DOM APIs.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-context
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 936e9203b3..92f3f90d36 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12247,31 +12247,6 @@ (define-public go-github-com-google-go-jsonnet
implementation.")
(license license:asl2.0)))
-(define-public go-github-com-google-safehtml
- (package
- (name "go-github-com-google-safehtml")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/safehtml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/google/safehtml"))
- (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
- (home-page "https://github.com/google/safehtml")
- (synopsis "Safe HTML for Go")
- (description
- "Package safehtml provides immutable string-like types which represent values
-that are guaranteed to be safe, by construction or by escaping or sanitization,
-to use in various HTML contexts and with various DOM APIs.")
- (license license:bsd-3)))
-
(define-public go-github-com-google-shlex
(package
(name "go-github-com-google-shlex")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 27/67] gnu: go-github-com-google-safehtml: Remove input labels.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6897dbf14865b56164616da1f3fd5115fdf7227d.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web (go-github-com-google-safehtml): Remove labels.

Change-Id: I20f5748496988c9e64fa0783bb51507c6cfa933e
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ce95d1b467..9aa3fe8233 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -163,7 +163,8 @@ (define-public go-github-com-google-safehtml
(build-system go-build-system)
(arguments
'(#:import-path "github.com/google/safehtml"))
- (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+ (propagated-inputs
+ (list go-golang-org-x-text))
(home-page "https://github.com/google/safehtml")
(synopsis "Safe HTML for Go")
(description
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 28/67] gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
60079baea01b842771d61ef1f5f055bd31e2f9b8.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-bep-golibsass): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: I514ae05a8c04eea2084cbcb7e4d84c83b6b71bb4
---
gnu/packages/golang-web.scm | 61 ++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 58 -----------------------------------
2 files changed, 60 insertions(+), 59 deletions(-)

Toggle diff (157 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9aa3fe8233..72f2a7d84c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -34,7 +35,8 @@ (define-module (gnu packages golang-web)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
- #:use-module (gnu packages golang-check))
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages web))
;;; Commentary:
;;;
@@ -95,6 +97,63 @@ (define-public go-github-com-aymerick-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-bep-golibsass
+ (package
+ (name "go-github-com-bep-golibsass")
+ (version "0.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bep/golibsass")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "libsass_src")
+ #t))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bep/golibsass/libsass"
+ #:unpack-path "github.com/bep/golibsass"
+ ;; The dev build tag modifies the build to link to system libsass
+ ;; instead of including the bundled one (which we remove.)
+ ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
+ #:build-flags '("-tags" "dev")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-bindings
+ ;; Generate bindings for system libsass, replacing the
+ ;; pre-generated bindings.
+ (lambda* (#:key inputs unpack-path #:allow-other-keys)
+ (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
+ (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src")))
+ (substitute* (string-append "src/" unpack-path "/gen/main.go")
+ (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
+ (string-append "\"" libsass-src "\""))
+ (("../../libsass_src/src/")
+ libsass-src)))
+ (invoke "go" "generate" (string-append unpack-path "/gen"))
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (if tests?
+ (invoke "go" "test" import-path "-tags" "dev"))
+ #t)))))
+ (propagated-inputs
+ (list libsass))
+ (native-inputs
+ `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
+ ("libsass-src" ,(package-source libsass))))
+ (home-page "https://github.com/bep/golibsass")
+ (synopsis "Easy to use Go bindings for LibSass")
+ (description
+ "This package provides SCSS compiler support for Go applications.")
+ (license license:expat)))
+
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 92f3f90d36..e7316f9923 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10245,64 +10245,6 @@ (define-public go-github-com-gologme-log
additions.")
(license license:bsd-3))))
-(define-public go-github-com-bep-golibsass
- (package
- (name "go-github-com-bep-golibsass")
- (version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bep/golibsass")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "libsass_src")
- #t))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bep/golibsass/libsass"
- #:unpack-path "github.com/bep/golibsass"
- ;; The dev build tag modifies the build to link to system libsass
- ;; instead of including the bundled one (which we remove.)
- ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
- #:build-flags '("-tags" "dev")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'generate-bindings
- ;; Generate bindings for system libsass, replacing the
- ;; pre-generated bindings.
- (lambda* (#:key inputs unpack-path #:allow-other-keys)
- (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
- (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src")))
- (substitute* (string-append "src/" unpack-path "/gen/main.go")
- (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
- (string-append "\"" libsass-src "\""))
- (("../../libsass_src/src/")
- libsass-src)))
- (invoke "go" "generate" (string-append unpack-path "/gen"))
- #t))
- (replace 'check
- (lambda* (#:key tests? import-path #:allow-other-keys)
- (if tests?
- (invoke "go" "test" import-path "-tags" "dev"))
- #t)))))
- (propagated-inputs
- (list libsass))
- (native-inputs
- `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
- ("libsass-src" ,(package-source libsass))))
- (home-page "https://github.com/bep/golibsass")
- (synopsis "Easy to use Go bindings for LibSass")
- (description
- "This package provides SCSS compiler support for Go applications.")
- (license license:expat)))
-
(define-public go-github-com-hashicorp-go-syslog
(package
(name "go-github-com-hashicorp-go-syslog")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 29/67] gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f127bb56224c6ecdb2585efadcc7bbf1a6593559.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-gopkg-in-square-go-jose-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 72f2a7d84c..976179f44e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -683,6 +683,35 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-gopkg-in-square-go-jose-v2
+ (package
+ (name "go-gopkg-in-square-go-jose-v2")
+ (version "2.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/square/go-jose")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "gopkg.in/square/go-jose.v2"))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (native-inputs
+ (list go-github-com-google-go-cmp-cmp
+ go-github-com-stretchr-testify))
+ (home-page "https://gopkg.in/square/go-jose.v2")
+ (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
+ (description
+ "This package aims to provide an implementation of the Javascript Object
+Signing and Encryption set of standards. This includes support for JSON Web
+Encryption, JSON Web Signature, and JSON Web Token standards.")
+ (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 e7316f9923..8b8e80c0f8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3222,35 +3222,6 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
-(define-public go-gopkg-in-square-go-jose-v2
- (package
- (name "go-gopkg-in-square-go-jose-v2")
- (version "2.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/square/go-jose")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "gopkg.in/square/go-jose.v2"))
- (propagated-inputs
- (list go-golang-org-x-crypto))
- (native-inputs
- (list go-github-com-google-go-cmp-cmp
- go-github-com-stretchr-testify))
- (home-page "https://gopkg.in/square/go-jose.v2")
- (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
- (description
- "This package aims to provide an implementation of the Javascript Object
-Signing and Encryption set of standards. This includes support for JSON Web
-Encryption, JSON Web Signature, and JSON Web Token standards.")
- (license license:asl2.0)))
-
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 30/67] gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
32da37ae6cd070b03e64374123e86691e9cd8716.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 976179f44e..792406ab97 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -182,6 +182,33 @@ (define-public go-github-com-chris-ramon-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-coreos-go-oidc
+ (package
+ (name "go-github-com-coreos-go-oidc")
+ (version "2.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/coreos/go-oidc"))
+ (propagated-inputs
+ (list go-github-com-pquerna-cachecontrol
+ go-golang-org-x-oauth2
+ go-gopkg-in-square-go-jose-v2))
+ (home-page "https://github.com/coreos/go-oidc")
+ (synopsis "OpenID Connect support for Go")
+ (description
+ "This package enables OpenID Connect support for the
+@code{go-golang-org-x-oauth2} package.")
+ (license license:asl2.0)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8b8e80c0f8..a58b558f5f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9116,33 +9116,6 @@ (define-public go-github-com-charmbracelet-glamour
use one of our glamorous default themes.")
(license license:expat)))
-(define-public go-github-com-coreos-go-oidc
- (package
- (name "go-github-com-coreos-go-oidc")
- (version "2.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-oidc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/coreos/go-oidc"))
- (propagated-inputs
- (list go-github-com-pquerna-cachecontrol
- go-golang-org-x-oauth2
- go-gopkg-in-square-go-jose-v2))
- (home-page "https://github.com/coreos/go-oidc")
- (synopsis "OpenID Connect support for Go")
- (description
- "This package enables OpenID Connect support for the
-@code{go-golang-org-x-oauth2} package.")
- (license license:asl2.0)))
-
(define-public go-github-com-coreos-go-oidc-v3
(package
(inherit go-github-com-coreos-go-oidc)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 31/67] gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
33f02a5b8af45940b9ba32719e0e918cf4744354.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (68 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 792406ab97..0219ffb5e5 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -209,6 +209,28 @@ (define-public go-github-com-coreos-go-oidc
@code{go-golang-org-x-oauth2} package.")
(license license:asl2.0)))
+(define-public go-github-com-coreos-go-oidc-v3
+ (package
+ (inherit go-github-com-coreos-go-oidc)
+ (name "go-github-com-coreos-go-oidc-v3")
+ (version "3.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
+ (arguments
+ (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
+ #:import-path "github.com/coreos/go-oidc/v3/oidc"
+ #:unpack-path "github.com/coreos/go-oidc/v3"))
+ (propagated-inputs
+ (list go-github-com-go-jose-go-jose-v3
+ go-golang-org-x-oauth2))))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a58b558f5f..20a1d7ae18 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9116,28 +9116,6 @@ (define-public go-github-com-charmbracelet-glamour
use one of our glamorous default themes.")
(license license:expat)))
-(define-public go-github-com-coreos-go-oidc-v3
- (package
- (inherit go-github-com-coreos-go-oidc)
- (name "go-github-com-coreos-go-oidc-v3")
- (version "3.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-oidc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
- (arguments
- (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
- #:import-path "github.com/coreos/go-oidc/v3/oidc"
- #:unpack-path "github.com/coreos/go-oidc/v3"))
- (propagated-inputs
- (list go-github-com-go-jose-go-jose-v3
- go-golang-org-x-oauth2))))
-
(define-public go-github-com-coreos-go-semver
(package
(name "go-github-com-coreos-go-semver")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 32/67] gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f79841de79055dde811a02cae6f7fdc957721b38.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-sdk): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0219ffb5e5..352c831e41 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -71,6 +71,34 @@ (define-public go-github-com-andybalholm-cascadia
the parse trees produced by the html package.")
(license license:bsd-2)))
+(define-public go-github-com-aws-sdk
+ (package
+ (name "go-github-com-aws-sdk")
+ (version "1.35.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go/aws"
+ #:unpack-path "github.com/aws/aws-sdk-go"))
+ (propagated-inputs
+ (list go-github-com-go-sql-driver-mysql
+ go-github-com-jmespath-go-jmespath
+ go-github-com-pkg-errors
+ go-golang-org-x-net))
+ (home-page "https://github.com/aws/aws-sdk-go")
+ (synopsis "Library to access Amazon Web Services (AWS)")
+ (description
+ "This is the official AWS SDK for the Go programming language.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 20a1d7ae18..10297c324d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3194,34 +3194,6 @@ (define-public go-github-com-hebcal-hebcal-go
and anniversaries.")
(license license:gpl2+))))
-(define-public go-github-com-aws-sdk
- (package
- (name "go-github-com-aws-sdk")
- (version "1.35.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go/aws"
- #:unpack-path "github.com/aws/aws-sdk-go"))
- (propagated-inputs
- (list go-github-com-go-sql-driver-mysql
- go-github-com-jmespath-go-jmespath go-github-com-pkg-errors
- go-golang-org-x-net))
- (home-page "https://github.com/aws/aws-sdk-go")
- (synopsis "Library to access Amazon Web Services (AWS)")
- (description
- "This is the official AWS SDK for the Go programming language.")
- (license license:asl2.0)))
-
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 33/67] gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0b638ec9c31fa614d89c6d9b36069d4415fd8394.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-valyala-fasthttp): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (112 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 352c831e41..f59415452f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -760,6 +761,46 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-github-com-valyala-fasthttp
+ (package
+ (name "go-github-com-valyala-fasthttp")
+ (version "1.39.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/valyala/fasthttp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/valyala/fasthttp"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; Tests hang forever with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (propagated-inputs
+ (list go-github-com-andybalholm-brotli
+ go-github-com-klauspost-compress
+ go-github-com-valyala-bytebufferpool
+ go-github-com-valyala-tcplisten
+ go-golang-org-x-crypto
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/valyala/fasthttp")
+ (synopsis "Provides fast HTTP server and client API")
+ (description
+ "This package provides a Go module @code{fasthttp} which may be used as
+replacement for native @code{net/http} module.")
+ (license license:expat)))
+
(define-public go-gopkg-in-square-go-jose-v2
(package
(name "go-gopkg-in-square-go-jose-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 10297c324d..b5f406de83 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11041,46 +11041,6 @@ (define-public go-github-com-valyala-bytebufferpool
anti-fragmentation protection.")
(license license:expat)))
-(define-public go-github-com-valyala-fasthttp
- (package
- (name "go-github-com-valyala-fasthttp")
- (version "1.39.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/valyala/fasthttp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/valyala/fasthttp"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; Tests hang forever with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (propagated-inputs
- (list go-golang-org-x-sys
- go-golang-org-x-net
- go-golang-org-x-crypto
- go-github-com-valyala-tcplisten
- go-github-com-valyala-bytebufferpool
- go-github-com-klauspost-compress
- go-github-com-andybalholm-brotli))
- (home-page "https://github.com/valyala/fasthttp")
- (synopsis "Provides fast HTTP server and client API")
- (description
- "This package provides a Go module @code{fasthttp} which may be used as
-replacement for native @code{net/http} module.")
- (license license:expat)))
-
(define-public go-github-com-valyala-tcplisten
(package
(name "go-github-com-valyala-tcplisten")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 34/67] gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f32381c605f9bff6d4cbcd1edfc0185a3bc91684.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-go-chi-chi-v5): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (90 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f59415452f..2570be62f7 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,17 +1,17 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
-;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -284,6 +284,29 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-go-chi-chi-v5
+ (package
+ (name "go-github-com-go-chi-chi-v5")
+ (version "5.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-chi/chi")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/go-chi/chi/v5"))
+ (home-page "https://github.com/go-chi/chi")
+ (synopsis "Composable router for HTTP services written in Go")
+ (description
+ "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
+decompose request handling into many smaller layers.")
+ (license license:expat)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b5f406de83..3c1693b0c8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11854,29 +11854,6 @@ (define-public go-github-com-dreamacro-go-shadowsocks2
@end itemize")
(license license:asl2.0)))
-(define-public go-github-com-go-chi-chi-v5
- (package
- (name "go-github-com-go-chi-chi-v5")
- (version "5.0.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-chi/chi")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/go-chi/chi/v5"))
- (home-page "https://github.com/go-chi/chi")
- (synopsis "Composable router for HTTP services written in Go")
- (description
- "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
-decompose request handling into many smaller layers.")
- (license license:expat)))
-
(define-public go-sigs-k8s-io-yaml
(package
(name "go-sigs-k8s-io-yaml")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 35/67] gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3ca6f6a476216de9f843a1a19f931294d2e64a88.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-julienschmidt-httprouter): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

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

Toggle diff (93 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 2570be62f7..c501f55685 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,9 +6,9 @@
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
@@ -631,6 +631,29 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-julienschmidt-httprouter
+ (package
+ (name "go-github-com-julienschmidt-httprouter")
+ (version "1.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/julienschmidt/httprouter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/julienschmidt/httprouter"))
+ (home-page "https://github.com/julienschmidt/httprouter")
+ (synopsis "High performance HTTP request router")
+ (description
+ "Package @code{httprouter} is a trie based high performance HTTP request
+router.")
+ (license license:bsd-3)))
+
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3c1693b0c8..bd70a4271c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9338,29 +9338,6 @@ (define-public go-github-com-juju-ansiterm
for color and styles.")
(license license:lgpl3)))
-(define-public go-github-com-julienschmidt-httprouter
- (package
- (name "go-github-com-julienschmidt-httprouter")
- (version "1.3.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/julienschmidt/httprouter")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/julienschmidt/httprouter"))
- (home-page "https://github.com/julienschmidt/httprouter")
- (synopsis "High performance HTTP request router")
- (description
- "Package @code{httprouter} is a trie based high performance HTTP request
-router.")
- (license license:bsd-3)))
-
(define-public go-github-com-kevinburke-ssh-config
(package
(name "go-github-com-kevinburke-ssh-config")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 553095cb75..6808bcd597 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -35,6 +35,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages hardware)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 36/67] gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
728fc07d2a4ec331eb2c6fbc7bae19767c7ade3c.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-emicklei-go-restful): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c501f55685..4cef7b6641 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
@@ -260,6 +261,29 @@ (define-public go-github-com-coreos-go-oidc-v3
(list go-github-com-go-jose-go-jose-v3
go-golang-org-x-oauth2))))
+(define-public go-github-com-emicklei-go-restful
+ (package
+ (name "go-github-com-emicklei-go-restful")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emicklei/go-restful")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/emicklei/go-restful"))
+ (home-page "https://github.com/emicklei/go-restful")
+ (synopsis "Build REST-style web services using Go")
+ (description "This package provides @code{go-restful}, which helps
+developers to use @code{http} methods explicitly and in a way that's
+consistent with the HTTP protocol definition.")
+ (license license:expat)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bd70a4271c..30d32dcba9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4346,30 +4346,6 @@ (define-public go-github-com-blang-semver
(description "Semver is a library for Semantic versioning written in Go.")
(license license:expat))))
-(define-public go-github-com-emicklei-go-restful
- (package
- (name "go-github-com-emicklei-go-restful")
- (version "3.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emicklei/go-restful")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/emicklei/go-restful"))
- (home-page "https://github.com/emicklei/go-restful")
- (synopsis "Build REST-style web services using Go")
- (description "This package provides @code{go-restful}, which helps
-developers to use @code{http} methods explicitly and in a way that's consistent
-with the HTTP protocol definition.")
- (license license:expat)))
-
(define-public go-cloud-google-com-go-compute-metadata
(package
(name "go-cloud-google-com-go-compute-metadata")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 37/67] gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f2bf0dcc68b587bff0de748ccd6e0c4162984761.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tv42-httpunix): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4cef7b6641..caccb126bc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -831,6 +832,30 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-github-com-tv42-httpunix
+ (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22")
+ (revision "0"))
+ (package
+ (name "go-github-com-tv42-httpunix")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tv42/httpunix")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/tv42/httpunix"))
+ (home-page "https://github.com/tv42/httpunix")
+ (synopsis "Go library to talk HTTP over Unix domain sockets")
+ (description "This package is a Go library to talk HTTP over Unix domain
+sockets.")
+ (license license:expat))))
+
(define-public go-github-com-valyala-fasthttp
(package
(name "go-github-com-valyala-fasthttp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 30d32dcba9..7a85b1ebcd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4298,30 +4298,6 @@ (define-public go-github-com-tomnomnom-gron
absolute \"path\" to it.")
(license license:expat)))
-(define-public go-github-com-tv42-httpunix
- (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22")
- (revision "0"))
- (package
- (name "go-github-com-tv42-httpunix")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tv42/httpunix")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/tv42/httpunix"))
- (home-page "https://github.com/tv42/httpunix")
- (synopsis "Go library to talk HTTP over Unix domain sockets")
- (description "This package is a Go library to talk HTTP over Unix domain
-sockets.")
- (license license:expat))))
-
(define-public go-github-com-blang-semver
(let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 38/67] gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
64e0072810f5e4f6cd8990a81d1ce794a91ffba0.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-opentracing-opentracing-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index caccb126bc..d021be005f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -703,6 +704,30 @@ (define-public go-github-com-microcosm-cc-bluemonday
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-opentracing-opentracing-go
+ (package
+ (name "go-github-com-opentracing-opentracing-go")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/opentracing/opentracing-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/opentracing/opentracing-go"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/opentracing/opentracing-go")
+ (synopsis "OpenTracing API for Go")
+ (description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
+ (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 7a85b1ebcd..f0c9dcf5e6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1797,30 +1797,6 @@ (define-public go-github-com-mufti1-interconv
(description "InterConv converts interfaces into any data type.")
(license license:expat))))
-(define-public go-github-com-opentracing-opentracing-go
- (package
- (name "go-github-com-opentracing-opentracing-go")
- (version "1.2.0")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/opentracing/opentracing-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/opentracing/opentracing-go"))
- (native-inputs
- (list go-github-com-stretchr-testify))
- (home-page "https://github.com/opentracing/opentracing-go")
- (synopsis "OpenTracing API for Go")
- (description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
- (license license:asl2.0)))
-
(define-public go-github-com-operatorfoundation-monolith-go
(package
(name "go-github-com-operatorfoundation-monolith-go")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 39/67] gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2b47d8d8ef92ee30d9bab5d629a8c362cede28ea.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-francoispqt-gojay): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (85 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d021be005f..2790e2b5aa 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,9 +5,9 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
@@ -310,6 +310,31 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-francoispqt-gojay
+ (package
+ (name "go-github-com-francoispqt-gojay")
+ (version "1.2.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/francoispqt/gojay")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/francoispqt/gojay"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (synopsis "JSON encoder/decoder with powerful stream API for Golang")
+ (description "GoJay is a performant JSON encoder/decoder for Golang. It has
+a simple API and doesn't use reflection. It relies on small interfaces to
+decode/encode structures and slices.")
+ (home-page "https://github.com/francoispqt/gojay")
+ (license license:expat)))
+
(define-public go-github-com-go-chi-chi-v5
(package
(name "go-github-com-go-chi-chi-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f0c9dcf5e6..4d504e30a2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7241,31 +7241,6 @@ (define-public go-github-com-lunixbochs-vtclean
optionally preserving color.")
(license license:expat)))
-(define-public go-github-com-francoispqt-gojay
- (package
- (name "go-github-com-francoispqt-gojay")
- (version "1.2.13")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/francoispqt/gojay")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/francoispqt/gojay"))
- (propagated-inputs
- (list go-github-com-stretchr-testify))
- (synopsis "JSON encoder/decoder with powerful stream API for Golang")
- (description "GoJay is a performant JSON encoder/decoder for Golang. It has
-a simple API and doesn't use reflection. It relies on small interfaces to
-decode/encode structures and slices.")
- (home-page "https://github.com/francoispqt/gojay")
- (license license:expat)))
-
(define-public go-github-com-pkg-errors
(package
(name "go-github-com-pkg-errors")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 40/67] gnu: go-github-com-francoispqt-gojay: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7770025f43bf1504c80e4c6e13721224ca2aee6b.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-francoispqt-gojay):
[propagated-inputs]: Swap to [native-inputs].

Change-Id: Ie83ea13685036b2688f668cde8bbb831ba5cd602
---
gnu/packages/golang-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 2790e2b5aa..59312f791a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -326,7 +326,7 @@ (define-public go-github-com-francoispqt-gojay
(build-system go-build-system)
(arguments
'(#:import-path "github.com/francoispqt/gojay"))
- (propagated-inputs
+ (native-inputs
(list go-github-com-stretchr-testify))
(synopsis "JSON encoder/decoder with powerful stream API for Golang")
(description "GoJay is a performant JSON encoder/decoder for Golang. It has
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 41/67] gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
014df16c3a367550ed7e7100d5331670489d0e9d.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-goccy-go-json): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 59312f791a..e92e04979e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
@@ -358,6 +359,27 @@ (define-public go-github-com-go-chi-chi-v5
decompose request handling into many smaller layers.")
(license license:expat)))
+(define-public go-github-com-goccy-go-json
+ (package
+ (name "go-github-com-goccy-go-json")
+ (version "0.9.10")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/goccy/go-json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/goccy/go-json"))
+ (home-page "https://github.com/goccy/go-json")
+ (synopsis "JSON encoder/decoder in Go")
+ (description "Fast JSON encoder/decoder compatible with encoding/json for Go.")
+ (license license:expat)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4d504e30a2..5b37222c93 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4002,28 +4002,6 @@ (define-public go-github-com-burntsushi-toml
is similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-goccy-go-json
- (package
- (name "go-github-com-goccy-go-json")
- (version "0.9.10")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/goccy/go-json")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/goccy/go-json"))
- (home-page "https://github.com/goccy/go-json")
- (synopsis "JSON encoder/decoder in Go")
- (description
- "Fast JSON encoder/decoder compatible with encoding/json for Go.")
- (license license:expat)))
-
(define-public go-github-com-getsentry-raven-go
(let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 42/67] gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b909488aac16b3683de722fa0978d1e344ec14c5.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jmespath-go-jmespath): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e92e04979e..9f7b0e39dc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -704,6 +704,33 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-jmespath-go-jmespath
+ (package
+ (name "go-github-com-jmespath-go-jmespath")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jmespath/go-jmespath")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jmespath/go-jmespath"))
+ (native-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/jmespath/go-jmespath")
+ (synopsis "Golang implementation of JMESPath")
+ (description
+ "This package implements JMESPath, a query language for JSON. It
+transforms one JSON document into another through a JMESPath expression.")
+ (license license:asl2.0)))
+
(define-public go-github-com-julienschmidt-httprouter
(package
(name "go-github-com-julienschmidt-httprouter")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5b37222c93..ce7047aa0f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8699,33 +8699,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-jmespath-go-jmespath
- (package
- (name "go-github-com-jmespath-go-jmespath")
- (version "0.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jmespath/go-jmespath")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jmespath/go-jmespath"))
- (native-inputs
- (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib
- go-gopkg-in-yaml-v2))
- (home-page "https://github.com/jmespath/go-jmespath")
- (synopsis "Golang implementation of JMESPath")
- (description
- "This package implements JMESPath, a query language for JSON. It
-transforms one JSON document into another through a JMESPath expression.")
- (license license:asl2.0)))
-
(define-public go-github-com-muesli-reflow-wordwrap
(package
(name "go-github-com-muesli-reflow-wordwrap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 43/67] gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
042691a38862aaa7f3a3817c3db6330bfcf776db.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-smithy-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9f7b0e39dc..c23e6df581 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -104,6 +104,30 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-smithy-go
+ (package
+ (name "go-github-com-aws-smithy-go")
+ (version "1.13.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/smithy-go")
+ (commit "v1.13.5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/smithy-go"))
+ (propagated-inputs
+ (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+ (home-page "https://github.com/aws/smithy-go")
+ (synopsis "Smithy code generators for Go")
+ (description
+ "Package smithy provides the core components for a Smithy SDK.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ce7047aa0f..f0b2007d25 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,30 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-smithy-go
- (package
- (name "go-github-com-aws-smithy-go")
- (version "1.13.5")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/smithy-go")
- (commit "v1.13.5")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/smithy-go"))
- (propagated-inputs
- (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
- (home-page "https://github.com/aws/smithy-go")
- (synopsis "Smithy code generators for Go")
- (description
- "Package smithy provides the core components for a Smithy SDK.")
- (license license:asl2.0)))
-
(define-public go-github-com-aws-aws-sdk-go-v2
(package
(name "go-github-com-aws-aws-sdk-go-v2")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 44/67] gnu: go-github-com-aws-smithy-go: Adjust description.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f97517e81dd1e4d1200cf29a16dd4f67f1559074.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-aws-smithy-go):[description]
Add link to Smithy.

Change-Id: I3c913db5940dc97fb3fa8874fd8b1bf9baaf4a59
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c23e6df581..ae9ffd3fd2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -123,7 +123,8 @@ (define-public go-github-com-aws-smithy-go
(propagated-inputs
(list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
(home-page "https://github.com/aws/smithy-go")
- (synopsis "Smithy code generators for Go")
+ (synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators
+for Go")
(description
"Package smithy provides the core components for a Smithy SDK.")
(license license:asl2.0)))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 45/67] gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7151a5e898f7d3fd3fa3b7917729045db7db9d3b.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/version-control.scm: Add (gnu packages golang-web) module.

Change-Id: I6e980749d9f9c1373adfc717b0195a1b8c32d6af
---
gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
gnu/packages/version-control.scm | 1 +
3 files changed, 27 insertions(+), 25 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ae9ffd3fd2..1542c409fe 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -104,6 +104,32 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-aws-sdk-go-v2
+ (package
+ (name "go-github-com-aws-aws-sdk-go-v2")
+ (version "1.17.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go-v2")
+ (commit "v1.17.3")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go
+ go-github-com-google-go-cmp-cmp
+ go-github-com-jmespath-go-jmespath))
+ (home-page "https://github.com/aws/aws-sdk-go-v2")
+ (synopsis "AWS SDK for Go v2")
+ (description
+ "Package sdk is the official AWS SDK v2 for the Go programming language.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f0b2007d25..d983b1bda3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,31 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2
- (package
- (name "go-github-com-aws-aws-sdk-go-v2")
- (version "1.17.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go-v2")
- (commit "v1.17.3")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-jmespath-go-jmespath
- go-github-com-google-go-cmp-cmp
- go-github-com-aws-smithy-go))
- (home-page "https://github.com/aws/aws-sdk-go-v2")
- (synopsis "AWS SDK for Go v2")
- (description
- "Package sdk is the official AWS SDK v2 for the Go programming language.")
- (license license:asl2.0)))
-
(define-public go-github-com-aws-aws-sdk-go-v2-config
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 76fa8ef5d0..5f60c4400c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -105,6 +105,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-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 46/67] gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
289175879901877f5f4520626ba32a35ac93a203.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (84 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1542c409fe..7ecdcbd8b5 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
@@ -104,6 +105,33 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not
+;; in use anywhere. Keep it here for the farther review.
+(define-public go-github-com-aws-aws-sdk-go
+ (package
+ (name "go-github-com-aws-aws-sdk-go")
+ (version "1.36.18")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ (list go-github-com-jmespath-go-jmespath))
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go"
+ #:phases %standard-phases))
+ (synopsis "The official AWS SDK for the Go programming language")
+ (description
+ "The official AWS SDK for the Go programming language.")
+ (home-page "https://github.com/aws/aws-sdk-go")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-aws-sdk-go-v2
(package
(name "go-github-com-aws-aws-sdk-go-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d983b1bda3..27d9006c80 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11423,31 +11423,6 @@ (define-public go-github-com-mtibben-androiddnsfix
(define-public go-github-com-androiddnsfix
(deprecated-package "go-github-com-androiddnsfix" go-github-com-mtibben-androiddnsfix))
-(define-public go-github-com-aws-aws-sdk-go
- (package
- (name "go-github-com-aws-aws-sdk-go")
- (version "1.36.18")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-github-com-jmespath-go-jmespath))
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go"
- #:phases %standard-phases))
- (synopsis "The official AWS SDK for the Go programming language")
- (description
- "The official AWS SDK for the Go programming language.")
- (home-page "https://github.com/aws/aws-sdk-go")
- (license license:asl2.0)))
-
(define-public go-gopkg-in-ini
(package
(name "go-gopkg-in-ini")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 47/67] gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
10a0f621f4ddcbe3976811ed89eb85ef788229d0.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (47 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7ecdcbd8b5..fde9a89ea3 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -158,6 +158,18 @@ (define-public go-github-com-aws-aws-sdk-go-v2
"Package sdk is the official AWS SDK v2 for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-aws-sdk-go-v2-config
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-config")
+ (version "1.18.5")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp-cmp
+ go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 27d9006c80..645e51b57a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,17 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-config
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-config")
- (version "1.18.5")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-google-go-cmp-cmp
- go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 48/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3805bce7ab5ca7735bb092cf5de291ac9d8f5115.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index fde9a89ea3..bfda5ffa31 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -170,6 +170,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
(list go-github-com-google-go-cmp-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
+ (version "1.44.161")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 645e51b57a..bfdf45d1b3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
- (version "1.44.161")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 49/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5e4110994488ddd65c6fdac835ff717d42ded444.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index bfda5ffa31..5dd73bd4db 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -181,6 +181,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
+ (version "1.11.27")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bfdf45d1b3..1134cfa458 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
- (version "1.11.27")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 50/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f88e214d55f615eecd5a3ac1a637ede60274c089.1699403992.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5dd73bd4db..4bc9c944cb 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -192,6 +192,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
+ (version "1.13.10")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1134cfa458..9c102ad7f0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
- (version "1.13.10")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 51/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
92ca154ce7d988a4087b276a748394ab79b98c13.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4bc9c944cb..aadf8ac73e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -203,6 +203,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
+ (version "1.17.7")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9c102ad7f0..7b254db540 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
- (version "1.17.7")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 52/67] gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5898f4615f84df3f64a4ee7ac6a8f9ac60b1ce79.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-s3): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index aadf8ac73e..e87634cdaa 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -181,6 +181,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-s3")
+ (version "1.30.0")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7b254db540..2c331802ff 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-s3")
- (version "1.30.0")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 53/67] gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
bc12947593a631d7155ec6df7afb167ceab996fe.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-feature-s3-manager): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (44 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e87634cdaa..616a14fdf1 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -170,6 +170,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
(list go-github-com-google-go-cmp-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager")
+ (version "1.11.44")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2c331802ff..efd46895ec 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11173,16 +11173,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager")
- (version "1.11.44")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public aws-vault
(package
(name "aws-vault")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 54/67] gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
39ac5469713a00b2b351246c4055c92a3be697f5.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-nwidger-jsoncolor): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (85 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 616a14fdf1..96873f020c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
+;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -934,6 +935,32 @@ (define-public go-github-com-microcosm-cc-bluemonday
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-nwidger-jsoncolor
+ (package
+ (name "go-github-com-nwidger-jsoncolor")
+ (version "0.3.0")
+ (home-page "https://github.com/nwidger/jsoncolor")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/nwidger/jsoncolor"))
+ (native-inputs
+ (list go-github-com-fatih-color))
+ (synopsis "Colorized JSON marshalling and encoding")
+ (description
+ "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s
+@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type
+which produce colorized output using github.com/fatih/color.")
+ (license license:expat)))
+
(define-public go-github-com-opentracing-opentracing-go
(package
(name "go-github-com-opentracing-opentracing-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index efd46895ec..bf71d0de49 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8786,33 +8786,6 @@ (define-public go-github-com-muesli-termenv
escape sequences and color conversions.")
(license license:expat)))
-(define-public go-github-com-nwidger-jsoncolor
- (package
- (name "go-github-com-nwidger-jsoncolor")
- (version "0.3.0")
- (home-page "https://github.com/nwidger/jsoncolor")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/nwidger/jsoncolor"))
- (native-inputs
- (list go-github-com-fatih-color))
- (synopsis "Colorized JSON marshalling and encoding")
- (description
- "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s
-@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type
-which produce colorized output using github.com/fatih/color.")
- (license license:expat)))
-
(define-public go-github-com-olekukonko-tablewriter
(package
(name "go-github-com-olekukonko-tablewriter")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 55/67] gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
652f04c38c0d31b6be3727e97542a39df9f023ca.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: If1ba5e4d866ce74fa35ae9126c6ba4cd0b149dab
---
gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/networking.scm | 1 +
gnu/packages/uucp.scm | 1 +
4 files changed, 26 insertions(+), 24 deletions(-)

Toggle diff (103 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 96873f020c..4771657add 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
@@ -757,6 +758,29 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-hjson-hjson-go
+ (package
+ (name "go-github-com-hjson-hjson-go")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hjson/hjson-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/hjson/hjson-go"))
+ (home-page "https://hjson.org/")
+ (synopsis "Human JSON implementation for Go")
+ (description "Hjson is a syntax extension to JSON. It is intended to be
+used like a user interface for humans, to read and edit before passing the
+JSON data to the machine.")
+ (license license:expat)))
+
(define-public go-github-com-jcmturner-dnsutils-v2
(package
(name "go-github-com-jcmturner-dnsutils-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bf71d0de49..0e608a8eab 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9965,30 +9965,6 @@ (define-public go-github-com-hashicorp-go-syslog
(description "This package is a very simple wrapper around log/syslog")
(license license:expat)))
-(define-public go-github-com-hjson-hjson-go
- (package
- (name "go-github-com-hjson-hjson-go")
- (version "4.3.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/hjson/hjson-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/hjson/hjson-go"))
- (home-page "https://hjson.org/")
- (synopsis "Human JSON implementation for Go")
- (description "Hjson is a syntax extension to JSON. It is intended to be
-used like a user interface for humans, to read and edit before passing the
-JSON data to the machine.")
- (license license:expat)))
-
(define-public go-golang-zx2c4-com-wireguard
(package
(name "go-golang-zx2c4-com-wireguard")
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b0381515a5..36d33da42b 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -122,6 +122,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index e10de59aa2..1626c90c36 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-web)
#:use-module (gnu packages texinfo)
#:use-module (guix licenses)
#:use-module (guix packages)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 56/67] gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4a5d041e2c254ba76e1b3fae234bc929f5144bd0.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonschema): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (105 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4771657add..c97dfa7757 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,47 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-xeipuuv-gojsonschema
+ (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonschema")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonschema")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonschema"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "schema_test.go"
+ (("\\{\"phase\": \"remote ref, " all)
+ (string-append "// " all))
+ (("\\{\"phase\": \"valid definition" all)
+ (string-append "// " all))
+ (("\\{\"phase\": \"invalid definition" all)
+ (string-append "// " all)))))))))
+ (propagated-inputs
+ (list go-github-com-xeipuuv-gojsonreference
+ go-github-com-xeipuuv-gojsonpointer
+ go-github-com-stretchr-testify))
+ (home-page "https://github.com/xeipuuv/gojsonschema")
+ (synopsis "Implementation of JSON Schema for Go")
+ (description
+ "This package provides an implementation of JSON Schema for the Go
+programming language, which supports draft-04, draft-06 and draft-07.")
+ (license license:asl2.0))))
+
(define-public go-gopkg-in-square-go-jose-v2
(package
(name "go-gopkg-in-square-go-jose-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0e608a8eab..16b13cd59e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12176,46 +12176,6 @@ (define-public go-github-com-xeipuuv-gojsonreference
programming language.")
(license license:asl2.0))))
-(define-public go-github-com-xeipuuv-gojsonschema
- (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonschema")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonschema")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonschema"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda* (#:key import-path #:allow-other-keys)
- (with-directory-excursion (string-append "src/" import-path)
- (substitute* "schema_test.go"
- (("\\{\"phase\": \"remote ref, " all)
- (string-append "// " all))
- (("\\{\"phase\": \"valid definition" all)
- (string-append "// " all))
- (("\\{\"phase\": \"invalid definition" all)
- (string-append "// " all)))))))))
- (propagated-inputs (list go-github-com-xeipuuv-gojsonreference
- go-github-com-xeipuuv-gojsonpointer
- go-github-com-stretchr-testify))
- (home-page "https://github.com/xeipuuv/gojsonschema")
- (synopsis "Implementation of JSON Schema for Go")
- (description
- "This package provides an implementation of JSON Schema for the Go
-programming language, which supports draft-04, draft-06 and draft-07.")
- (license license:asl2.0))))
-
(define-public go-github-com-niemeyer-pretty
(package
(name "go-github-com-niemeyer-pretty")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 57/67] gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
16580a2abe2bbf313053530c8e61f00ea712b9d9.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-xeipuuv-gojsonschema):
[propagated-inputs]: Move go-github-com-stretchr-testify from here ...
[native-inputs]: ... to here.

Change-Id: Id865d5821060cd847aeb9ccfc7b7a477e12f7b7b
---
gnu/packages/golang-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c97dfa7757..346ca87cc7 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1232,10 +1232,11 @@ (define-public go-github-com-xeipuuv-gojsonschema
(string-append "// " all))
(("\\{\"phase\": \"invalid definition" all)
(string-append "// " all)))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-xeipuuv-gojsonreference
- go-github-com-xeipuuv-gojsonpointer
- go-github-com-stretchr-testify))
+ go-github-com-xeipuuv-gojsonpointer))
(home-page "https://github.com/xeipuuv/gojsonschema")
(synopsis "Implementation of JSON Schema for Go")
(description
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 58/67] gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
fc18bce487ed0fcf2d46047bed1eebad0ee869b9.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonpointer): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: I1c77a5a1b0e85fa57578ff29c9e3c403e4d62bc8
---
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 346ca87cc7..1f9fe0ffca 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,31 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-xeipuuv-gojsonpointer
+ (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonpointer")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonpointer")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonpointer"))
+ (home-page "https://github.com/xeipuuv/gojsonpointer")
+ (synopsis "Implementation of JSON Pointer for Go")
+ (description
+ "This package provides an implementation of JSON Pointer for the Go
+programming language.")
+ (license license:asl2.0))))
+
(define-public go-github-com-xeipuuv-gojsonschema
(let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 16b13cd59e..fb01dd4679 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12125,31 +12125,6 @@ (define-public go-github-com-go-test-deep
when comparing complex types like structures and maps.")
(license license:expat)))
-(define-public go-github-com-xeipuuv-gojsonpointer
- (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonpointer")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonpointer")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonpointer"))
- (home-page "https://github.com/xeipuuv/gojsonpointer")
- (synopsis "Implementation of JSON Pointer for Go")
- (description
- "This package provides an implementation of JSON Pointer for the Go
-programming language.")
- (license license:asl2.0))))
-
(define-public go-github-com-xeipuuv-gojsonreference
(let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 59/67] gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c7153027dfa58352e9c429f140d9ef798d673992.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonreference): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1f9fe0ffca..7f6ced049c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1227,6 +1227,33 @@ (define-public go-github-com-xeipuuv-gojsonpointer
programming language.")
(license license:asl2.0))))
+(define-public go-github-com-xeipuuv-gojsonreference
+ (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonreference")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonreference")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonreference"))
+ (propagated-inputs
+ (list go-github-com-xeipuuv-gojsonpointer))
+ (home-page "https://github.com/xeipuuv/gojsonreference")
+ (synopsis "Implementation of JSON Reference for Go")
+ (description
+ "This package provides an implementation of JSON Reference for the Go
+programming language.")
+ (license license:asl2.0))))
+
(define-public go-github-com-xeipuuv-gojsonschema
(let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index fb01dd4679..cf2c0dcfc0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12125,32 +12125,6 @@ (define-public go-github-com-go-test-deep
when comparing complex types like structures and maps.")
(license license:expat)))
-(define-public go-github-com-xeipuuv-gojsonreference
- (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonreference")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonreference")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonreference"))
- (propagated-inputs (list go-github-com-xeipuuv-gojsonpointer))
- (home-page "https://github.com/xeipuuv/gojsonreference")
- (synopsis "Implementation of JSON Reference for Go")
- (description
- "This package provides an implementation of JSON Reference for the Go
-programming language.")
- (license license:asl2.0))))
-
(define-public go-github-com-niemeyer-pretty
(package
(name "go-github-com-niemeyer-pretty")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 60/67] gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cd77877510c5df4e52e1e7b684061239b7cac181.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-whyrusleeping-json-filter): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7f6ced049c..fbfa1049a4 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,31 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-whyrusleeping-json-filter
+ (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
+ (revision "0"))
+ (package
+ (name "go-github-com-whyrusleeping-json-filter")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/whyrusleeping/json-filter")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path
+ "github.com/whyrusleeping/json-filter"))
+ (home-page "https://github.com/whyrusleeping/json-filter")
+ (synopsis "Library to query JSON objects marshalled into map[string]interface")
+ (description "A library to query JSON objects marshalled into
+@command{map[string]interface{}}.")
+ (license license:expat))))
+
(define-public go-github-com-xeipuuv-gojsonpointer
(let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index cf2c0dcfc0..3f93f6eaee 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6508,32 +6508,6 @@ (define-public go-github-com-pmezard-go-difflib
(description "This package provides unified and context-aware diffs in Go.")
(license license:bsd-3)))
-(define-public go-github-com-whyrusleeping-json-filter
- (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
- (revision "0"))
- (package
- (name "go-github-com-whyrusleeping-json-filter")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/whyrusleeping/json-filter")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path
- "github.com/whyrusleeping/json-filter"))
- (home-page "https://github.com/whyrusleeping/json-filter")
- (synopsis "Library to query JSON objects marshalled into map[string]interface")
- (description "A library to query JSON objects marshalled into
-@command{map[string]interface{}}.")
- (license license:expat))))
-
(define-public go-github-com-whyrusleeping-progmeter
(let ((commit "f3e57218a75b913eff88d49a52c1debf9684ea04")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 61/67] gnu: go-github-com-stretchr-objx: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f407d9ffd55888295367c0bd6172b9259e32ec94.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-stretchr-objx,
go-github-com-stretchr-testify-bootstrap): Move from here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (134 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 42e501a6e3..b74864d808 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -378,6 +378,46 @@ (define-public go-github-com-onsi-ginkgo
Gomega matcher library.")
(license license:expat)))
+(define-public go-github-com-stretchr-objx
+ (package
+ (name "go-github-com-stretchr-objx")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stretchr/objx")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/stretchr/objx"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; The tests fail when run with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib))
+ (inputs
+ (list go-github-com-stretchr-testify-bootstrap))
+ (home-page "https://github.com/stretchr/objx")
+ (synopsis "Go package for dealing with maps, slices, JSON and other data")
+ (description "This package provides a Go library for dealing with maps,
+slices, JSON and other data.")
+ (license license:expat)))
+
(define-public go-github-com-stretchr-testify
(package
(name "go-github-com-stretchr-testify")
@@ -414,6 +454,17 @@ (define-public go-github-com-stretchr-testify
@end itemize")
(license license:expat)))
+(define go-github-com-stretchr-testify-bootstrap
+ (package
+ (inherit go-github-com-stretchr-testify)
+ (arguments
+ '(#:import-path "github.com/stretchr/testify"
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (propagated-inputs
+ (list go-gopkg-in-yaml-v3))))
+
(define-public go-github-com-tdewolff-test
(package
(name "go-github-com-tdewolff-test")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3f93f6eaee..feb1295e7b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4110,58 +4110,6 @@ (define-public go-github-com-jpillora-backoff
Go.")
(license license:expat))))
-(define-public go-github-com-stretchr-objx
- (package
- (name "go-github-com-stretchr-objx")
- (version "0.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/stretchr/objx")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "vendor")))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/stretchr/objx"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; The tests fail when run with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (propagated-inputs
- (list go-github-com-davecgh-go-spew
- go-github-com-pmezard-go-difflib))
- (inputs
- (list go-github-com-stretchr-testify-bootstrap))
- (home-page "https://github.com/stretchr/objx")
- (synopsis "Go package for dealing with maps, slices, JSON and other data")
- (description "This package provides a Go library for dealing with maps,
-slices, JSON and other data.")
- (license license:expat)))
-
-(define go-github-com-stretchr-testify-bootstrap
- (package
- (inherit go-github-com-stretchr-testify)
- (arguments
- '(#:import-path "github.com/stretchr/testify"
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (propagated-inputs
- (list go-gopkg-in-yaml-v3))))
-
(define-public go-github-com-technoweenie-multipartstreamer
(package
(name "go-github-com-technoweenie-multipartstreamer")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 62/67] gnu: go-github-com-google-go-github: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a4a5de9541387a017f4570ce16e56b09e58468e3.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-google-go-github): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (76 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index fbfa1049a4..20c3b0f3e1 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -538,6 +538,32 @@ (define-public go-github-com-goccy-go-json
(description "Fast JSON encoder/decoder compatible with encoding/json for Go.")
(license license:expat)))
+(define-public go-github-com-google-go-github
+ (package
+ (name "go-github-com-google-go-github")
+ (version "26.1.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/go-github")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:tests? #f ;application/octet-stream instead of text/plain
+ #:import-path "github.com/google/go-github/v26/github"
+ #:unpack-path "github.com/google/go-github/v26"))
+ (native-inputs
+ (list go-github-com-google-go-querystring go-golang-org-x-crypto))
+ (home-page "https://github.com/google/go-github/")
+ (synopsis "Client library for accessing the GitHub API v3")
+ (description "@code{go-github} is a Go client library for accessing the
+GitHub API v3.")
+ (license license:bsd-3)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index feb1295e7b..3ffe569ed5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7689,32 +7689,6 @@ (define-public go-github-com-google-go-querystring
into URL query parameters.")
(license license:bsd-3))))
-(define-public go-github-com-google-go-github
- (package
- (name "go-github-com-google-go-github")
- (version "26.1.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/go-github")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi"))))
- (build-system go-build-system)
- (arguments
- `(#:tests? #f ;application/octet-stream instead of text/plain
- #:import-path "github.com/google/go-github/v26/github"
- #:unpack-path "github.com/google/go-github/v26"))
- (native-inputs
- (list go-github-com-google-go-querystring go-golang-org-x-crypto))
- (home-page "https://github.com/google/go-github/")
- (synopsis "Client library for accessing the GitHub API v3")
- (description "@code{go-github} is a Go client library for accessing the
-GitHub API v3.")
- (license license:bsd-3)))
-
(define-public go-github-com-google-renameio
(package
(name "go-github-com-google-renameio")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 64/67] gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e2f95e23fde16bf99079f3f3257edd1e9fa04b75.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-getsentry-raven-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (96 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c046e0d46a..41c8c37a0b 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -45,6 +46,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 tls)
#:use-module (gnu packages web))
;;; Commentary:
@@ -521,6 +523,35 @@ (define-public go-github-com-francoispqt-gojay
(home-page "https://github.com/francoispqt/gojay")
(license license:expat)))
+;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is
+;; now read-only. The raven-go SDK is no longer maintained and was superseded
+;; by the sentry-go
+(define-public go-github-com-getsentry-raven-go
+ (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
+ (revision "0"))
+ (package
+ (name "go-github-com-getsentry-raven-go")
+ (version (git-version "0.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/getsentry/raven-go")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/getsentry/raven-go"))
+ (propagated-inputs
+ (list go-github-com-certifi-gocertifi go-github-com-pkg-errors))
+ (home-page "https://github.com/getsentry/raven-go")
+ (synopsis "Sentry client in Go")
+ (description "This package is a Go client API for the Sentry event/error
+logging system.")
+ (license license:bsd-3))))
+
(define-public go-github-com-go-chi-chi-v5
(package
(name "go-github-com-go-chi-chi-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d53fa5864a..d4d8d352a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4002,33 +4002,6 @@ (define-public go-github-com-burntsushi-toml
is similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-getsentry-raven-go
- (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
- (revision "0"))
- (package
- (name "go-github-com-getsentry-raven-go")
- (version (git-version "0.2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/getsentry/raven-go")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/getsentry/raven-go"))
- (propagated-inputs
- (list go-github-com-certifi-gocertifi go-github-com-pkg-errors))
- (home-page "https://github.com/getsentry/raven-go")
- (synopsis "Sentry client in Go")
- (description "This package is a Go client API for the Sentry event/error
-logging system.")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 65/67] gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ee1ed3c9a14a539ad37c6acd8644b90eb9c9cce0.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-go-telegram-bot-api-telegram-bot-api): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: Ia631773394faaff150c18b074c943565f6998e1f
---
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 41c8c37a0b..7759916c35 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -575,6 +575,31 @@ (define-public go-github-com-go-chi-chi-v5
decompose request handling into many smaller layers.")
(license license:expat)))
+(define-public go-github-com-go-telegram-bot-api-telegram-bot-api
+ (package
+ (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
+ (version "4.6.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
+ (build-system go-build-system)
+ (home-page "https://go-telegram-bot-api.dev/")
+ (arguments
+ (list #:tests? #f ; Upstream tests are broken.
+ #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
+ (propagated-inputs
+ (list go-github-com-technoweenie-multipartstreamer))
+ (synopsis "Golang bindings for the Telegram Bot API")
+ (description
+ "This package provides Golang bindings for the Telegram Bot API.")
+ (license license:expat)))
+
(define-public go-github-com-goccy-go-json
(package
(name "go-github-com-goccy-go-json")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d4d8d352a5..740ddbe440 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9921,31 +9921,6 @@ (define-public go-github-com-tekwizely-go-parsing
parsers, and related tools.")
(license license:expat))))
-(define-public go-github-com-go-telegram-bot-api-telegram-bot-api
- (package
- (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
- (version "4.6.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
- (build-system go-build-system)
- (home-page "https://go-telegram-bot-api.dev/")
- (arguments
- (list #:tests? #f ; Upstream tests are broken.
- #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
- (propagated-inputs
- (list go-github-com-technoweenie-multipartstreamer))
- (synopsis "Golang bindings for the Telegram Bot API")
- (description
- "This package provides Golang bindings for the Telegram Bot API.")
- (license license:expat)))
-
(define-public go-github.com-ulikunitz-xz
(package
(name "go-github.com-ulikunitz-xz")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 66/67] gnu: actionlint: Update to 1.6.26.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
146d0817c9568cee0bc5b15cb58e3fc094fd195a.1699403993.git.sharlatanus@gmail.com
* gnu/packages/check.scm (actionlint): Update to 1.6.26.
[inputs]: Swap go-github-com-robfig-cron-1.2 to go-github-com-robfig-cron

* gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): Delete variable.

Change-Id: Ie2c25254ffefb99f8808f74ae4a9d85bbbcb6437
---
gnu/packages/check.scm | 8 ++++----
gnu/packages/golang.scm | 18 ------------------
2 files changed, 4 insertions(+), 22 deletions(-)

Toggle diff (71 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index cf26196a24..fc338394bf 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -1069,7 +1069,7 @@ (define-public cpputest
(define-public actionlint
(package
(name "actionlint")
- (version "1.6.23")
+ (version "1.6.26")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1078,7 +1078,7 @@ (define-public actionlint
(file-name (git-file-name name version))
(sha256
(base32
- "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni"))))
+ "0j4ni2cryvqn3qim1r6q6sargh0wig6l4vjjwc40cgqvvkrdla04"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/rhysd/actionlint/cmd/actionlint"
@@ -1087,7 +1087,7 @@ (define-public actionlint
(inputs (list go-github-com-fatih-color
go-github-com-mattn-go-colorable
go-github-com-mattn-go-runewidth
- go-github-com-robfig-cron-1.2
+ go-github-com-robfig-cron
go-golang.org-x-sync-errgroup
go-golang.org-x-sync-semaphore
go-gopkg-in-yaml-v3))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 740ddbe440..cdf0f23a90 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7164,24 +7164,6 @@ (define-public go-github-com-robfig-cron
a cron spec parser and job runner.")
(license license:expat)))
-;; Required by actionlint. The version of `go-github-com-robfig-cron'
-;; packaged in Guix is newer and changed some error messages, causing
-;; unit tests in actionlint to fail.
-(define-public go-github-com-robfig-cron-1.2
- (package
- (inherit go-github-com-robfig-cron)
- (name "go-github-com-robfig-cron")
- (version "1.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/robfig/cron")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva"))))))
-
(define-public go-github-com-shirou-gopsutil
(let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 67/67] teams: go-team: Extend scope.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
25564d0cdaaeb40a6d29c5be70c8e365b89df07e.1699403993.git.sharlatanus@gmail.com
* etc/teams.scm: Add regex for all gnu/packages/golang.* files. Add
gnu/packages/syncthing.scm.

Change-Id: I47f43ea2c42b5c86f6a07a38fbaa4170743c4203
---
etc/teams.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/etc/teams.scm b/etc/teams.scm
index 2f920a5876..90cfe42811 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -299,7 +299,8 @@ (define-team ruby
(define-team go
(team 'go
#:name "Go team"
- #:scope (list "gnu/packages/golang.scm"
+ #:scope (list "gnu/packages/golang(-.+|)\\.scm$"
+ "gnu/packages/syncthing.scm"
"guix/build/go-build-system.scm"
"guix/build-system/go.scm"
"guix/import/go.scm"
--
2.41.0
S
S
Sharlatan Hellseher wrote on 8 Nov 2023 01:41
[PATCH 63/67] gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0823b15b8e1b5c37d60b32400fc5dc56e1ac5caa.1699403993.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-cloud-google-com-go-compute-metadata): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/mail.scm: Add (gnu packages golang-web) module.

Change-Id: Ic97e5f4afd26376d37860fbb4758e8037e758f58
---
gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
gnu/packages/mail.scm | 1 +
3 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 20c3b0f3e1..c046e0d46a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
@@ -55,6 +56,32 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-cloud-google-com-go-compute-metadata
+ (package
+ (name "go-cloud-google-com-go-compute-metadata")
+ (version "0.81.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/googleapis/google-cloud-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "cloud.google.com/go"
+ #:import-path "cloud.google.com/go/compute/metadata"))
+ (home-page
+ "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
+ (synopsis
+ "Go wrapper for Google Compute Engine metadata service")
+ (description
+ "This package provides access to Google Compute Engine (GCE) metadata and
+API service accounts for Go.")
+ (license license:asl2.0)))
+
(define-public go-github-com-andybalholm-cascadia
(package
(name "go-github-com-andybalholm-cascadia")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3ffe569ed5..d53fa5864a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4224,33 +4224,6 @@ (define-public go-github-com-blang-semver
(description "Semver is a library for Semantic versioning written in Go.")
(license license:expat))))
-(define-public go-cloud-google-com-go-compute-metadata
- (package
- (name "go-cloud-google-com-go-compute-metadata")
- (version "0.81.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/googleapis/google-cloud-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "cloud.google.com/go"
- #:import-path "cloud.google.com/go/compute/metadata"))
- (home-page
- "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
- (synopsis
- "Go wrapper for Google Compute Engine metadata service")
- (description
- "This package provides access to Google Compute Engine (GCE) metadata and
-API service accounts for Go.")
- (license license:asl2.0)))
-
(define-public go-github-com-google-cadvisor
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
(revision "0"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5b5b29a468..d57d1f9980 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-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages gtk)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 13 Nov 2023 21:00
(address . 66827@debbugs.gnu.org)
CAO+9K5rMAVq-wa=63+1O_wz+WmX8qijnZH6Z9i7gnVMF9KbMJQ@mail.gmail.com
Hi,

Gentle ping here and I might need some encouragement to grasp status
"pending" .
It lists some build failures and lint warnings which were present
previously. I may submit adjustment in separate issue when this one is
merged.

Thanks,
Oleg
Attachment: file
S
S
Sharlatan Hellseher wrote on 20 Nov 2023 18:44
(address . 66827@debbugs.gnu.org)
CAO+9K5oKRQfznP0pm4Oy8OvegFL4n2wJ=FUVS96J9EzGR+zYhg@mail.gmail.com
Hi Guix,

It looks like QA is still pending here. Probably it needs to be rebased on
a fresh master HEAD. Please, let me know if I need to send v3.

Thanks,
Oleg
Attachment: file
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
123a0b9b76c24c29184c527dabb652384f7be762.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm: New file.
* gnu/local.mk: Add to gnu/packages/golang-web.scm scope.
---
gnu/local.mk | 1 +
gnu/packages/golang-web.scm | 39 +++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
create mode 100644 gnu/packages/golang-web.scm

Toggle diff (61 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index a8142bb0f2..aa9403a8eb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -304,6 +304,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gobby.scm \
%D%/packages/golang.scm \
%D%/packages/golang-check.scm \
+ %D%/packages/golang-web.scm \
%D%/packages/gperf.scm \
%D%/packages/gpodder.scm \
%D%/packages/gps.scm \
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
new file mode 100644
index 0000000000..feb2854d9c
--- /dev/null
+++ b/gnu/packages/golang-web.scm
@@ -0,0 +1,39 @@
+;;; 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-web)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix build-system go)
+ #:use-module (guix git-download)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages golang))
+
+;;; Commentary:
+;;;
+;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON,
+;;; Web-framework, REST-API or similar functionality.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;

base-commit: 62376e3eb67644454bc655bed56be4be965bd13e
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 02/66] gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7942ea1d12b00fb231223ee20714b4ecfcb45220.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-mux): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada
---
gnu/packages/finance.scm | 1 +
gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/web.scm | 1 +
4 files changed, 27 insertions(+), 24 deletions(-)

Toggle diff (102 lines)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index cd419f2102..5ff86bcb72 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -93,6 +93,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index feb2854d9c..c779600411 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,6 +34,29 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-gorilla-mux
+ (package
+ (name "go-github-com-gorilla-mux")
+ (version "1.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/mux")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/mux"))
+ (home-page "https://github.com/gorilla/mux")
+ (synopsis "URL router and dispatcher for Go")
+ (description
+ "Gorilla/Mux implements a request router and dispatcher for matching
+incoming requests with their respective handler.")
+ (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 5e9211026b..7e796db5a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4737,30 +4737,6 @@ (define-public go-github-com-gorilla-context
(description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
(license license:bsd-3))))
-(define-public go-github-com-gorilla-mux
- (package
- (name "go-github-com-gorilla-mux")
- (version "1.8.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/mux")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/mux"))
- (home-page "https://github.com/gorilla/mux")
- (synopsis "URL router and dispatcher for Go")
- (description
- "Gorilla/Mux implements a request router and dispatcher for matching
-incoming requests with their respective handler.")
- (license license:bsd-3)))
-
(define-public go-github-com-andybalholm-brotli
(package
(name "go-github-com-andybalholm-brotli")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4a4252138b..3837dcb043 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -142,6 +142,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 03/66] gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
519d514afc934c84d30e0e9eaadb2e14cc11c388.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-css): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module.
* gnu/packages/golang.scm: As above...

Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f
---
gnu/packages/configuration-management.scm | 1 +
gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 23 +----------------------
3 files changed, 25 insertions(+), 22 deletions(-)

Toggle diff (96 lines)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 95a7e8615f..296f48dcd5 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages version-control)
#:use-module (gnu packages textutils)
#:use-module ((guix licenses) #:prefix license:)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c779600411..1d61a76268 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,28 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-gorilla-css
+ (package
+ (name "go-github-com-gorilla-css")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/css")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/gorilla/css/scanner"
+ #:unpack-path "github.com/gorilla/css"))
+ (home-page "https://github.com/gorilla/css/")
+ (synopsis "CSS3 tokenizer")
+ (description "This package provides a CSS3 tokenizer.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-mux
(package
(name "go-github-com-gorilla-mux")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7e796db5a9..0c7d22281a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -80,6 +80,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-web)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages mp3)
@@ -4691,28 +4692,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-gorilla-css
- (package
- (name "go-github-com-gorilla-css")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/css")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gorilla/css/scanner"
- #:unpack-path "github.com/gorilla/css"))
- (home-page "https://github.com/gorilla/css/")
- (synopsis "CSS3 tokenizer")
- (description "This package provides a CSS3 tokenizer.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-context
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 04/66] gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a3f4311aab19fbffaa4b8ae48867e033ca3d66bd.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aymerick-douceur): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1d61a76268..39a83990ce 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -35,6 +35,32 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-aymerick-douceur
+ (package
+ (name "go-github-com-aymerick-douceur")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aymerick/douceur/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/aymerick/douceur"))
+ (native-inputs
+ (list go-github-com-andybalholm-cascadia
+ go-github-com-gorilla-css
+ go-github-com-puerkitobio-goquery
+ go-golang-org-x-net))
+ (home-page "https://github.com/aymerick/douceur/")
+ (synopsis "CSS parser and inliner")
+ (description "This package provides a CSS parser and inliner.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0c7d22281a..3aad98c9ef 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9405,31 +9405,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-aymerick-douceur
- (package
- (name "go-github-com-aymerick-douceur")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aymerick/douceur/")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/aymerick/douceur"))
- (native-inputs
- (list go-github-com-puerkitobio-goquery
- go-github-com-andybalholm-cascadia go-golang-org-x-net
- go-github-com-gorilla-css))
- (home-page "https://github.com/aymerick/douceur/")
- (synopsis "CSS parser and inliner")
- (description "This package provides a CSS parser and inliner.")
- (license license:expat)))
-
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 06/66] gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e8534b500525935ea7559f07cb8cc30854188211.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-puerkitobio-goquery): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (81 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3c1abfff2c..8d8b4fb85c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,8 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
@@ -131,6 +133,30 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-puerkitobio-goquery
+ (package
+ (name "go-github-com-puerkitobio-goquery")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/PuerkitoBio/goquery")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/PuerkitoBio/goquery"))
+ (propagated-inputs
+ (list go-github-com-andybalholm-cascadia go-golang-org-x-net))
+ (home-page "https://github.com/PuerkitoBio/goquery")
+ (synopsis "Features similar to jQuery to the Go language")
+ (description "@code{goquery} brings a syntax and a set of features similar
+to jQuery to the Go language.")
+ (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 a6365a9686..7868f71206 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9330,30 +9330,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-puerkitobio-goquery
- (package
- (name "go-github-com-puerkitobio-goquery")
- (version "1.7.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/PuerkitoBio/goquery")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/PuerkitoBio/goquery"))
- (propagated-inputs
- (list go-github-com-andybalholm-cascadia go-golang-org-x-net))
- (home-page "https://github.com/PuerkitoBio/goquery")
- (synopsis "Features similar to jQuery to the Go language")
- (description "@code{goquery} brings a syntax and a set of features similar
-to jQuery to the Go language.")
- (license license:bsd-3)))
-
(define-public go-github-com-jmespath-go-jmespath
(package
(name "go-github-com-jmespath-go-jmespath")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 07/66] gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
41968cb50b19e54b4e2fa5d451cee42a957464da.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-chris-ramon-douceur): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (89 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 8d8b4fb85c..79a69bc842 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
@@ -88,6 +88,34 @@ (define-public go-github-com-aymerick-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-chris-ramon-douceur
+ (package
+ (name "go-github-com-chris-ramon-douceur")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/chris-ramon/douceur")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/chris-ramon/douceur"))
+ (propagated-inputs
+ (list go-github-com-aymerick-douceur
+ go-github-com-gorilla-css))
+ (native-inputs
+ (list go-github-com-puerkitobio-goquery
+ go-github-com-andybalholm-cascadia
+ go-golang-org-x-net))
+ (home-page "https://github.com/chris-ramon/douceur/")
+ (synopsis "CSS parser and inliner")
+ (description "This package provides a CSS parser and inliner.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7868f71206..a4f13b8c9d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9357,34 +9357,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-chris-ramon-douceur
- (package
- (name "go-github-com-chris-ramon-douceur")
- (version "0.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/chris-ramon/douceur")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/chris-ramon/douceur"))
- (propagated-inputs
- (list go-github-com-aymerick-douceur
- go-github-com-gorilla-css))
- (native-inputs
- (list go-github-com-puerkitobio-goquery
- go-github-com-andybalholm-cascadia
- go-golang-org-x-net))
- (home-page "https://github.com/chris-ramon/douceur/")
- (synopsis "CSS parser and inliner")
- (description "This package provides a CSS parser and inliner.")
- (license license:expat)))
-
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 08/66] gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e6875e1eb393b662a29ac94fdc601d02a920677b.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-websocket): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/ipfs.scm: Add (gnu packages golang-web) module.

Change-Id: I844738ec0b178a6a1746b01659c93a20919c2736
---
gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++
gnu/packages/golang.scm | 21 ---------------------
gnu/packages/ipfs.scm | 1 +
3 files changed, 24 insertions(+), 21 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 79a69bc842..0ca70cec38 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -161,6 +162,28 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-websocket
+ (package
+ (name "go-github-com-gorilla-websocket")
+ (version "1.5.0")
+ (home-page "https://github.com/gorilla/websocket")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/gorilla/websocket"))
+ (synopsis "Fast WebSocket implementation for Go")
+ (description "Gorilla WebSocket is a Go implementation of the WebSocket
+protocol.")
+ (license license:bsd-2)))
+
(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 a4f13b8c9d..a3c6df391b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12773,27 +12773,6 @@ (define-public go-github-com-google-shlex
using shell-style rules for quoting and commenting.")
(license license:asl2.0)))
-(define-public go-github-com-gorilla-websocket
- (package
- (name "go-github-com-gorilla-websocket")
- (version "1.5.0")
- (home-page "https://github.com/gorilla/websocket")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/gorilla/websocket"))
- (synopsis "Fast WebSocket implementation for Go")
- (description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.")
- (license license:bsd-2)))
-
(define-public go-github-com-sourcegraph-jsonrpc2
(package
(name "go-github-com-sourcegraph-jsonrpc2")
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a4c0613e40..fc66582c8a 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-web)
#:use-module (gnu packages python)
#:use-module (gnu packages shells)
#:use-module (gnu packages syncthing))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 09/66] gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
deff77a7959b8b383a9303ca50c9a6b29ae2f3ec.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-sourcegraph-jsonrpc2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/databases.scm: Add (gnu packages golang-web) module.

Change-Id: Idda2e18ae5d3e19f72265bdd017eadddc25bcad9
---
gnu/packages/databases.scm | 1 +
gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 26 --------------------------
3 files changed, 27 insertions(+), 26 deletions(-)

Toggle diff (88 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f0ea100c3b..eb135b05fd 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -108,6 +108,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-check)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0ca70cec38..f9e7039707 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -208,6 +208,32 @@ (define-public go-github-com-puerkitobio-goquery
to jQuery to the Go language.")
(license license:bsd-3)))
+(define-public go-github-com-sourcegraph-jsonrpc2
+ (package
+ (name "go-github-com-sourcegraph-jsonrpc2")
+ (version "0.1.0")
+ (home-page "https://github.com/sourcegraph/jsonrpc2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/sourcegraph/jsonrpc2"))
+ (propagated-inputs
+ (list go-github-com-daviddengcn-go-colortext
+ go-github-com-gorilla-websocket
+ go-github-com-motemen-go-colorine))
+ (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
+ (description
+ "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
+ (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 a3c6df391b..723550e76e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12773,32 +12773,6 @@ (define-public go-github-com-google-shlex
using shell-style rules for quoting and commenting.")
(license license:asl2.0)))
-(define-public go-github-com-sourcegraph-jsonrpc2
- (package
- (name "go-github-com-sourcegraph-jsonrpc2")
- (version "0.1.0")
- (home-page "https://github.com/sourcegraph/jsonrpc2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/sourcegraph/jsonrpc2"))
- (propagated-inputs
- (list
- go-github-com-daviddengcn-go-colortext
- go-github-com-motemen-go-colorine
- go-github-com-gorilla-websocket))
- (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
- (description
- "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
- (license license:expat)))
-
(define-public go-github-com-disintegration-imaging
(package
(name "go-github-com-disintegration-imaging")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 10/66] gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
99cbc8995e47ef339d584eb0cbf49fa153900ec1.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-handlers): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: I7535bdecc681e230f4aee70115a3dea847d40e6f
---
gnu/packages/backup.scm | 1 +
gnu/packages/golang-web.scm | 28 +++++++++++++++++++++++++++-
gnu/packages/golang.scm | 26 --------------------------
3 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (99 lines)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 49b0fe2620..bd0373c931 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-web)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f9e7039707..0480f648eb 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,9 +1,10 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
@@ -139,6 +140,31 @@ (define-public go-github-com-gorilla-css
(description "This package provides a CSS3 tokenizer.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-handlers
+ (package
+ (name "go-github-com-gorilla-handlers")
+ (version "1.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/handlers")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
+ (arguments
+ '(#:tests? #f ; Tries to download from the internet
+ #:import-path "github.com/gorilla/handlers"))
+ (home-page "https://github.com/gorilla/handlers")
+ (synopsis "Middleware for Go HTTP services and web applications")
+ (description "A collection of useful middleware for Go HTTP services and
+web applications.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-mux
(package
(name "go-github-com-gorilla-mux")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 723550e76e..57330a8d7a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4742,32 +4742,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-handlers
- (package
- (name "go-github-com-gorilla-handlers")
- (version "1.5.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/handlers")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
- (build-system go-build-system)
- (propagated-inputs
- `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
- (arguments
- '(#:tests? #f ; Tries to download from the internet
- #:import-path "github.com/gorilla/handlers"))
- (home-page "https://github.com/gorilla/handlers")
- (synopsis "Middleware for Go HTTP services and web applications")
- (description "A collection of useful middleware for Go HTTP services
-and web applications.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-securecookie
(package
(name "go-github-com-gorilla-securecookie")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 05/66] gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6d4860b1de42a4787f7da39a8e3bc61c120045ad.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-andybalholm-cascadia): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 39a83990ce..3c1abfff2c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,30 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-github-com-andybalholm-cascadia
+ (package
+ (name "go-github-com-andybalholm-cascadia")
+ (version "1.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/andybalholm/cascadia")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/andybalholm/cascadia"))
+ (native-inputs
+ (list go-golang-org-x-net))
+ (home-page "https://github.com/andybalholm/cascadia/")
+ (synopsis "CSS selectors for HTML")
+ (description "The Cascadia package implements CSS selectors for use with
+the parse trees produced by the html package.")
+ (license license:bsd-2)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3aad98c9ef..a6365a9686 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9330,30 +9330,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-andybalholm-cascadia
- (package
- (name "go-github-com-andybalholm-cascadia")
- (version "1.3.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/andybalholm/cascadia")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/andybalholm/cascadia"))
- (native-inputs
- (list go-golang-org-x-net))
- (home-page "https://github.com/andybalholm/cascadia/")
- (synopsis "CSS selectors for HTML")
- (description "The Cascadia package implements CSS selectors for use with
-the parse trees produced by the html package.")
- (license license:bsd-2)))
-
(define-public go-github-com-puerkitobio-goquery
(package
(name "go-github-com-puerkitobio-goquery")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 11/66] gnu: go-github-com-gorilla-handlers: Remove input labels.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
69e2331430c5f85f0384252e5b9f554fd7f18364.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-gorilla-handlers): Remove labels.

Change-Id: I955408970a64d03823327912fdafcac5d7fbda93
---
gnu/packages/golang-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0480f648eb..3a3c5f9621 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -154,11 +154,11 @@ (define-public go-github-com-gorilla-handlers
(sha256
(base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s"))))
(build-system go-build-system)
- (propagated-inputs
- `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop)))
(arguments
'(#:tests? #f ; Tries to download from the internet
#:import-path "github.com/gorilla/handlers"))
+ (propagated-inputs
+ (list go-github-com-felixge-httpsnoop))
(home-page "https://github.com/gorilla/handlers")
(synopsis "Middleware for Go HTTP services and web applications")
(description "A collection of useful middleware for Go HTTP services and
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 12/66] gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4363e805c919652f327bee551059ca13041e5b77.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-felixge-httpsnoop): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (73 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 3a3c5f9621..c0ceb5b7ce 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -118,6 +118,30 @@ (define-public go-github-com-chris-ramon-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-felixge-httpsnoop
+ (package
+ (name "go-github-com-felixge-httpsnoop")
+ (version "1.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/felixge/httpsnoop")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/felixge/httpsnoop"))
+ (home-page "https://github.com/felixge/httpsnoop/")
+ (synopsis "Capture http related metrics")
+ (description
+ "Httpsnoop provides an easy way to capture http related
+metrics (i.e. response time, bytes written, and http status code) from your
+application's http.Handlers.")
+ (license license:expat)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 57330a8d7a..a3706ebb2e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5020,31 +5020,6 @@ (define-public go-github-com-spf13-viper
all types of configuration needs and formats.")
(license license:expat)))
-(define-public go-github-com-felixge-httpsnoop
- (package
- (name "go-github-com-felixge-httpsnoop")
- (version "1.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/felixge/httpsnoop")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/felixge/httpsnoop"))
- (home-page "https://github.com/felixge/httpsnoop/")
- (synopsis "Capture http related metrics")
- (description
- "Httpsnoop provides an easy way to capture http related
-metrics (i.e. response time, bytes written, and http status code) from your
-application's http.Handlers.")
- (license license:expat)))
-
(define-public go-github-com-fsnotify-fsnotify
(package
(name "go-github-com-fsnotify-fsnotify")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 13/66] gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e942846e7aa38f341e76e84844ec2fc1ede63d57.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-securecookie): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (73 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c0ceb5b7ce..1a77e0f6f2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -212,6 +212,30 @@ (define-public go-github-com-gorilla-mux
incoming requests with their respective handler.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-securecookie
+ (package
+ (name "go-github-com-gorilla-securecookie")
+ (version "1.1.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/securecookie")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/securecookie"))
+ (home-page "https://github.com/gorilla/securecookie")
+ (synopsis "Encodes and decodes authenticated and optionally encrypted
+cookie values")
+ (description
+ "Gorilla/securecookie encodes and decodes authenticated and optionally
+encrypted cookie values for Go web applications.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a3706ebb2e..cab67fea65 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4742,31 +4742,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-securecookie
- (package
- (name "go-github-com-gorilla-securecookie")
- (version "1.1.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/securecookie")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/securecookie"))
- (home-page "https://github.com/gorilla/securecookie")
- (synopsis "Encodes and decodes authenticated and optionally encrypted
-cookie values")
- (description
- "Gorilla/securecookie encodes and decodes authenticated and optionally
-encrypted cookie values for Go web applications.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-sessions
(package
(name "go-github-com-gorilla-sessions")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 14/66] gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4f940f0cda8f335712552e61c31023551502e3c0.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-sessions): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (83 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1a77e0f6f2..971b370115 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -236,6 +237,32 @@ (define-public go-github-com-gorilla-securecookie
encrypted cookie values for Go web applications.")
(license license:bsd-3)))
+(define-public go-github-com-gorilla-sessions
+ (package
+ (name "go-github-com-gorilla-sessions")
+ (version "1.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/sessions")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/sessions"))
+ (propagated-inputs
+ (list go-github-com-gorilla-securecookie))
+ (home-page "https://github.com/gorilla/sessions")
+ (synopsis "Manage user sessions in web applications")
+ (description
+ "This package that provides infrastructure for creating and managing user
+sessions in web applications. It supports cookie and filesystem-based
+sessions, flash messages, custom backends, and more.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-websocket
(package
(name "go-github-com-gorilla-websocket")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index cab67fea65..1d169ce227 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4742,31 +4742,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-sessions
- (package
- (name "go-github-com-gorilla-sessions")
- (version "1.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/sessions")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/sessions"))
- (propagated-inputs (list go-github-com-gorilla-securecookie))
- (home-page "https://github.com/gorilla/sessions")
- (synopsis "Manage user sessions in web applications")
- (description
- "This package that provides infrastructure for creating and
-managing user sessions in web applications. It supports cookie and
-filesystem-based sessions, flash messages, custom backends, and more.")
- (license license:bsd-3)))
-
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 15/66] gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d794601282b1d0bd46fd92fe07f79473f35ee7cf.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-gokrb5-v8): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: Ie7833a1f5712cc3899fd140741774e6b71f03967
---
gnu/packages/golang-web.scm | 52 ++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 48 ----------------------------------
2 files changed, 51 insertions(+), 49 deletions(-)

Toggle diff (131 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 971b370115..ae10a86551 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -30,7 +30,8 @@ (define-module (gnu packages golang-web)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages)
- #:use-module (gnu packages golang))
+ #:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-check))
;;; Commentary:
;;;
@@ -285,6 +286,55 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-jcmturner-gokrb5-v8
+ (package
+ (name "go-github-com-jcmturner-gokrb5-v8")
+ (version "8.4.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/gokrb5")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/gokrb5/v8"
+ #:unpack-path "github.com/jcmturner/gokrb5"))
+ (propagated-inputs
+ (list go-github-com-gorilla-sessions
+ go-github-com-hashicorp-go-uuid
+ go-github-com-jcmturner-aescts-v2
+ go-github-com-jcmturner-dnsutils-v2
+ go-github-com-jcmturner-gofork
+ go-github-com-jcmturner-goidentity-v6
+ go-github-com-jcmturner-rpc-v2-mstypes
+ go-github-com-jcmturner-rpc-v2-ndr
+ go-github-com-stretchr-testify
+ go-golang-org-x-crypto
+ go-golang-org-x-net))
+ (home-page "https://github.com/jcmturner/gokrb5")
+ (synopsis "Pure Go Kerberos library for clients and services")
+ (description "This package provides a pure Go Kerberos library. It
+features:
+@itemize
+@item Kerberos libraries for custom integration
+@item Parsing Keytab files
+@item Parsing krb5.conf files
+@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami))
+@end itemize
+
+On the client side, it provides a client that can authenticate to an SPNEGO
+Kerberos authenticated web service, and the ability to change client's
+password.
+
+On the server side, the library provides a HTTP handler wrapper implements
+SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
+Microsoft AD PAC authorization data.")
+ (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 1d169ce227..b0ae0da3e3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1437,54 +1437,6 @@ (define-public go-github-com-jcmturner-gofork
arounds until issues are addressed in the official distribution.")
(license license:bsd-3)))
-(define-public go-github-com-jcmturner-gokrb5-v8
- (package
- (name "go-github-com-jcmturner-gokrb5-v8")
- (version "8.4.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/gokrb5")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/gokrb5/v8"
- #:unpack-path "github.com/jcmturner/gokrb5"))
- (propagated-inputs (list go-golang-org-x-net
- go-golang-org-x-crypto
- go-github-com-stretchr-testify
- go-github-com-jcmturner-rpc-v2-ndr
- go-github-com-jcmturner-rpc-v2-mstypes
- go-github-com-jcmturner-goidentity-v6
- go-github-com-jcmturner-gofork
- go-github-com-jcmturner-dnsutils-v2
- go-github-com-jcmturner-aescts-v2
- go-github-com-hashicorp-go-uuid
- go-github-com-gorilla-sessions))
- (home-page "https://github.com/jcmturner/gokrb5")
- (synopsis "Pure Go Kerberos library for clients and services")
- (description "This package provides a pure Go Kerberos library. It
-features:
-@itemize
-@item Kerberos libraries for custom integration
-@item Parsing Keytab files
-@item Parsing krb5.conf files
-@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami))
-@end itemize
-
-On the client side, it provides a client that can authenticate to an SPNEGO
-Kerberos authenticated web service, and the ability to change client's
-password.
-
-On the server side, the library provides a HTTP handler wrapper implements
-SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes
-Microsoft AD PAC authorization data.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-rpc
(package
(name "go-github-com-jcmturner-rpc")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 16/66] gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b6e6496b9ca75160596f8cbd0ce236ad26ae4c21.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-gokrb5-v8)
[propagated-inputs]: go-github-com-stretchr-testify move from here ...
[native-inputs]: ... to here.

Change-Id: I93be99c60c15ba7861dd909e8856c800f8cf8314
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ae10a86551..580877f8fe 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -303,6 +303,8 @@ (define-public go-github-com-jcmturner-gokrb5-v8
(arguments
'(#:import-path "github.com/jcmturner/gokrb5/v8"
#:unpack-path "github.com/jcmturner/gokrb5"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-gorilla-sessions
go-github-com-hashicorp-go-uuid
@@ -312,7 +314,6 @@ (define-public go-github-com-jcmturner-gokrb5-v8
go-github-com-jcmturner-goidentity-v6
go-github-com-jcmturner-rpc-v2-mstypes
go-github-com-jcmturner-rpc-v2-ndr
- go-github-com-stretchr-testify
go-golang-org-x-crypto
go-golang-org-x-net))
(home-page "https://github.com/jcmturner/gokrb5")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 18/66] gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
50b2d6e9f77cfcff86c93ffbb656e600ff1c37be.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-dnsutils-v2):
Swap propagated-inputs to native-inputs.

Change-Id: I1d02b45559214d72828a78437766cf7c1e06f1b0
---
gnu/packages/golang-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9b2bcd7cbd..6a832291ab 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -302,7 +302,7 @@ (define-public go-github-com-jcmturner-dnsutils-v2
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jcmturner/dnsutils/v2"))
- (propagated-inputs
+ (native-inputs
(list go-github-com-stretchr-testify))
(home-page "https://github.com/jcmturner/dnsutils")
(synopsis "Go library with DNS utils")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 19/66] gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
6a026431734831c3ee13457422791114f54f703d.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-goidentity-v6): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 6a832291ab..751eb41b58 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -314,6 +314,30 @@ (define-public go-github-com-jcmturner-dnsutils-v2
network applications that require accessing services using SRV records.")
(license license:asl2.0)))
+(define-public go-github-com-jcmturner-goidentity-v6
+ (package
+ (name "go-github-com-jcmturner-goidentity-v6")
+ (version "6.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/goidentity")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/goidentity/v6"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
+ (home-page "https://github.com/jcmturner/goidentity")
+ (synopsis "Hold authenticated identities and their attributes")
+ (description "This package provides a standard interface for holding
+authenticated identities and their attributes.")
+ (license license:asl2.0)))
+
(define-public go-github-com-jcmturner-gokrb5-v8
(package
(name "go-github-com-jcmturner-gokrb5-v8")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d0cde62f61..ba9d3a80a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1363,30 +1363,6 @@ (define-public go-github-com-jcmturner-aescts-v2
encryption and decryption methods.")
(license license:asl2.0)))
-(define-public go-github-com-jcmturner-goidentity-v6
- (package
- (name "go-github-com-jcmturner-goidentity-v6")
- (version "6.0.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/goidentity")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/goidentity/v6"))
- (propagated-inputs
- (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
- (home-page "https://github.com/jcmturner/goidentity")
- (synopsis "Hold authenticated identities and their attributes")
- (description "This package provides a standard interface for holding
-authenticated identities and their attributes.")
- (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 29 Nov 2023 23:34
[PATCH v3 20/66] gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
39417c1106240282eedaa7872233d593590df3ca.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-jcmturner-goidentity-v6):
[propagated-inputs]: Move go-github-com-stretchr-testify from here ...
[native-inputs]: ... to here.

Change-Id: I1e7bd72b3bf1c0879426a6a4c5b3b1de1d316069
---
gnu/packages/golang-web.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (18 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 751eb41b58..8ced6a4c6f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -330,8 +330,10 @@ (define-public go-github-com-jcmturner-goidentity-v6
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jcmturner/goidentity/v6"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
- (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid))
+ (list go-github-com-hashicorp-go-uuid))
(home-page "https://github.com/jcmturner/goidentity")
(synopsis "Hold authenticated identities and their attributes")
(description "This package provides a standard interface for holding
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 21/66] gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0a93ff5572f23c604e77ac3abcba2ac80af26664.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-csrf): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 8ced6a4c6f..5be08caf2e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -144,6 +144,32 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-gorilla-csrf
+ (package
+ (name "go-github-com-gorilla-csrf")
+ (version "1.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/csrf")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
+ ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
+ (arguments
+ '(#:import-path "github.com/gorilla/csrf"))
+ (home-page "https://github.com/gorilla/csrf")
+ (synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
+ (description
+ "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
+middleware for Go web applications and services.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-css
(package
(name "go-github-com-gorilla-css")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ba9d3a80a9..15c32b9b6a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4643,33 +4643,6 @@ (define-public go-github-com-andybalholm-brotli
@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.")
(license license:expat)))
-(define-public go-github-com-gorilla-csrf
- (package
- (name "go-github-com-gorilla-csrf")
- (version "1.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/csrf")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav"))))
- (build-system go-build-system)
- (propagated-inputs
- `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie)
- ("github.com/pkg/errors" ,go-github-com-pkg-errors)))
- (arguments
- '(#:import-path "github.com/gorilla/csrf"))
- (home-page "https://github.com/gorilla/csrf")
- (synopsis "Cross Site Request Forgery (CSRF) prevention middleware")
- (description
- "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention
-middleware for Go web applications and services.")
- (license license:bsd-3)))
-
(define-public go-github-com-jonboulle-clockwork
(let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 22/66] gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
cfbcb7a31aae2e3fd452e533e737fba7694885fd.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tdewolff-minify-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (121 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5be08caf2e..d82cac46b9 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -28,6 +29,7 @@ (define-module (gnu packages golang-web)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix build-system go)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
@@ -466,6 +468,47 @@ (define-public go-github-com-sourcegraph-jsonrpc2
"Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
(license license:expat)))
+(define-public go-github-com-tdewolff-minify-v2
+ (package
+ (name "go-github-com-tdewolff-minify-v2")
+ (version "2.12.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/minify")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tdewolff/minify/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-hash
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion
+ (format #f "src/~a/~a" import-path dir)
+ (make-file-writable "hash.go")
+ (format #t "Generating `hash.go' for ~a...~%" dir)
+ (invoke "go" "generate")))
+ '("css" "html" "svg")))))))
+ (propagated-inputs
+ (list go-github-com-tdewolff-parse-v2))
+ (native-inputs
+ (list go-github-com-tdewolff-hasher
+ go-github-com-tdewolff-test))
+ (home-page "https://go.tacodewolff.nl/minify")
+ (synopsis "Go minifiers for web formats")
+ (description
+ "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and
+an interface to implement any other minifier.")
+ (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 15c32b9b6a..202abb196b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3437,46 +3437,6 @@ (define-public go-github-com-tdewolff-hasher
@code{string} to @code{uint32} mapper.")
(license license:bsd-3)))
-(define-public go-github-com-tdewolff-minify-v2
- (package
- (name "go-github-com-tdewolff-minify-v2")
- (version "2.12.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/minify")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/minify/v2"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-hash
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each
- (lambda (dir)
- (with-directory-excursion
- (format #f "src/~a/~a" import-path dir)
- (make-file-writable "hash.go")
- (format #t "Generating `hash.go' for ~a...~%" dir)
- (invoke "go" "generate")))
- '("css" "html" "svg")))))))
- (propagated-inputs
- (list go-github-com-tdewolff-parse-v2))
- (native-inputs
- (list go-github-com-tdewolff-hasher
- go-github-com-tdewolff-test))
- (home-page "https://go.tacodewolff.nl/minify")
- (synopsis "Go minifiers for web formats")
- (description
- "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and
-an interface to implement any other minifier.")
- (license license:expat)))
-
(define-public go-github-com-tdewolff-parse-v2
(package
(name "go-github-com-tdewolff-parse-v2")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:34
[PATCH v3 17/66] gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ad1849206493d56aa1547e5d491249f60219dd58.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jcmturner-dnsutils-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (79 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 580877f8fe..9b2bcd7cbd 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -286,6 +286,34 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-jcmturner-dnsutils-v2
+ (package
+ (name "go-github-com-jcmturner-dnsutils-v2")
+ (version "2.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jcmturner/dnsutils")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jcmturner/dnsutils/v2"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/jcmturner/dnsutils")
+ (synopsis "Go library with DNS utils")
+ (description
+ "The dnsutils package provides a Go function to return a map of Service
+Records (SRV) in the order they should be used for a given service, protocol
+and name. The order is determined by the records' priority and randomized
+selection based on their relative weighting. This package is useful for
+network applications that require accessing services using SRV records.")
+ (license license:asl2.0)))
+
(define-public go-github-com-jcmturner-gokrb5-v8
(package
(name "go-github-com-jcmturner-gokrb5-v8")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b0ae0da3e3..d0cde62f61 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1363,33 +1363,6 @@ (define-public go-github-com-jcmturner-aescts-v2
encryption and decryption methods.")
(license license:asl2.0)))
-(define-public go-github-com-jcmturner-dnsutils-v2
- (package
- (name "go-github-com-jcmturner-dnsutils-v2")
- (version "2.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jcmturner/dnsutils")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jcmturner/dnsutils/v2"))
- (propagated-inputs (list go-github-com-stretchr-testify))
- (home-page "https://github.com/jcmturner/dnsutils")
- (synopsis "Go library with DNS utils")
- (description
- "The dnsutils package provides a Go function to return a map of Service
-Records (SRV) in the order they should be used for a given service, protocol
-and name. The order is determined by the records' priority and randomized
-selection based on their relative weighting. This package is useful for
-network applications that require accessing services using SRV records.")
- (license license:asl2.0)))
-
(define-public go-github-com-jcmturner-goidentity-v6
(package
(name "go-github-com-jcmturner-goidentity-v6")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 23/66] gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
52840c10e13aeb1f7183d150f9a01ba22d4257d2.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tdewolff-parse-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (99 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d82cac46b9..9e68e96baf 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -509,6 +509,44 @@ (define-public go-github-com-tdewolff-minify-v2
an interface to implement any other minifier.")
(license license:expat)))
+(define-public go-github-com-tdewolff-parse-v2
+ (package
+ (name "go-github-com-tdewolff-parse-v2")
+ (version "2.6.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tdewolff/parse")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/tdewolff/parse/v2"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'regenerate-hash
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion
+ (format #f "src/~a/~a" import-path dir)
+ (make-file-writable "hash.go")
+ (format #t "Generating `hash.go' for ~a...~%" dir)
+ (invoke "go" "generate")))
+ '("css" "html")))))))
+ (native-inputs
+ (list go-github-com-tdewolff-hasher
+ go-github-com-tdewolff-test))
+ (home-page "https://github.com/tdewolff/parse")
+ (synopsis "Go parsers for web formats")
+ (description
+ "This package contains several lexers and parsers written 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 202abb196b..786752a0ad 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3437,43 +3437,6 @@ (define-public go-github-com-tdewolff-hasher
@code{string} to @code{uint32} mapper.")
(license license:bsd-3)))
-(define-public go-github-com-tdewolff-parse-v2
- (package
- (name "go-github-com-tdewolff-parse-v2")
- (version "2.6.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tdewolff/parse")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/tdewolff/parse/v2"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'regenerate-hash
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each
- (lambda (dir)
- (with-directory-excursion
- (format #f "src/~a/~a" import-path dir)
- (make-file-writable "hash.go")
- (format #t "Generating `hash.go' for ~a...~%" dir)
- (invoke "go" "generate")))
- '("css" "html")))))))
- (native-inputs
- (list go-github-com-tdewolff-hasher
- go-github-com-tdewolff-test))
- (home-page "https://github.com/tdewolff/parse")
- (synopsis "Go parsers for web formats")
- (description
- "This package contains several lexers and parsers written in Go.")
- (license license:expat)))
-
(define-public go-github-com-tj-docopt
(package
(name "go-github-com-tj-docopt")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 24/66] gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
954b909c7d3be1ce56dbacc2cd6ca1b2106e52e6.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-gorilla-context): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9e68e96baf..012ed0429c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -146,6 +146,32 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-gorilla-context
+ (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
+ (revision "0"))
+ (package
+ (name "go-github-com-gorilla-context")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gorilla/context")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/gorilla/context"))
+ (home-page "https://github.com/gorilla/context")
+ (synopsis "Go registry for request variables")
+ (description
+ "This package provides @code{gorilla/context}, which is a general
+purpose registry for global request variables in the Go programming
+language.")
+ (license license:bsd-3))))
+
(define-public go-github-com-gorilla-csrf
(package
(name "go-github-com-gorilla-csrf")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 786752a0ad..c48484da11 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4516,30 +4516,6 @@ (define-public go-github-com-google-cadvisor
containers.")
(license license:asl2.0))))
-(define-public go-github-com-gorilla-context
- (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
- (revision "0"))
- (package
- (name "go-github-com-gorilla-context")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gorilla/context")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/gorilla/context"))
- (home-page "https://github.com/gorilla/context")
- (synopsis "Go registry for request variables")
- (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
- (license license:bsd-3))))
-
(define-public go-github-com-andybalholm-brotli
(package
(name "go-github-com-andybalholm-brotli")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 25/66] gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a3314d9327699c7e2881624875b8c93b5bb1811b.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-microcosm-cc-bluemonday): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 012ed0429c..117742dc07 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -444,6 +444,30 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-microcosm-cc-bluemonday
+ (package
+ (name "go-github-com-microcosm-cc-bluemonday")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/microcosm-cc/bluemonday")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/microcosm-cc/bluemonday"))
+ (propagated-inputs
+ (list go-github-com-chris-ramon-douceur
+ go-golang-org-x-net))
+ (home-page "https://github.com/microcosm-cc/bluemonday/")
+ (synopsis "HTML sanitizer")
+ (description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
+ (license license:bsd-3)))
+
(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 c48484da11..f110da8d99 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9029,30 +9029,6 @@ (define-public go-github-com-jmespath-go-jmespath
transforms one JSON document into another through a JMESPath expression.")
(license license:asl2.0)))
-(define-public go-github-com-microcosm-cc-bluemonday
- (package
- (name "go-github-com-microcosm-cc-bluemonday")
- (version "1.0.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/microcosm-cc/bluemonday")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/microcosm-cc/bluemonday"))
- (propagated-inputs
- (list go-github-com-chris-ramon-douceur
- go-golang-org-x-net))
- (home-page "https://github.com/microcosm-cc/bluemonday/")
- (synopsis "HTML sanitizer")
- (description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
- (license license:bsd-3)))
-
(define-public go-github-com-muesli-reflow-wordwrap
(package
(name "go-github-com-muesli-reflow-wordwrap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 26/66] gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
31e0cfc511eea1eac478223ad4c36e85b4172dbb.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-google-safehtml): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 117742dc07..ce95d1b467 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
@@ -146,6 +147,31 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-google-safehtml
+ (package
+ (name "go-github-com-google-safehtml")
+ (version "0.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/safehtml")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/google/safehtml"))
+ (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+ (home-page "https://github.com/google/safehtml")
+ (synopsis "Safe HTML for Go")
+ (description
+ "Package safehtml provides immutable string-like types which represent
+values that are guaranteed to be safe, by construction or by escaping or
+sanitization, to use in various HTML contexts and with various DOM APIs.")
+ (license license:bsd-3)))
+
(define-public go-github-com-gorilla-context
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f110da8d99..89aeead50a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12374,31 +12374,6 @@ (define-public go-github-com-google-go-jsonnet
implementation.")
(license license:asl2.0)))
-(define-public go-github-com-google-safehtml
- (package
- (name "go-github-com-google-safehtml")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/safehtml")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/google/safehtml"))
- (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
- (home-page "https://github.com/google/safehtml")
- (synopsis "Safe HTML for Go")
- (description
- "Package safehtml provides immutable string-like types which represent values
-that are guaranteed to be safe, by construction or by escaping or sanitization,
-to use in various HTML contexts and with various DOM APIs.")
- (license license:bsd-3)))
-
(define-public go-github-com-google-shlex
(package
(name "go-github-com-google-shlex")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 27/66] gnu: go-github-com-google-safehtml: Remove input labels.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
bfeb70eb7306e37d546c0907f683a3ddef866fd4.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web (go-github-com-google-safehtml): Remove labels.

Change-Id: I20f5748496988c9e64fa0783bb51507c6cfa933e
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ce95d1b467..9aa3fe8233 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -163,7 +163,8 @@ (define-public go-github-com-google-safehtml
(build-system go-build-system)
(arguments
'(#:import-path "github.com/google/safehtml"))
- (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+ (propagated-inputs
+ (list go-golang-org-x-text))
(home-page "https://github.com/google/safehtml")
(synopsis "Safe HTML for Go")
(description
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 36/66] gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
38c0800e01aa230f25208332a7d03c117f6d356a.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-emicklei-go-restful): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c501f55685..4cef7b6641 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
@@ -260,6 +261,29 @@ (define-public go-github-com-coreos-go-oidc-v3
(list go-github-com-go-jose-go-jose-v3
go-golang-org-x-oauth2))))
+(define-public go-github-com-emicklei-go-restful
+ (package
+ (name "go-github-com-emicklei-go-restful")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emicklei/go-restful")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/emicklei/go-restful"))
+ (home-page "https://github.com/emicklei/go-restful")
+ (synopsis "Build REST-style web services using Go")
+ (description "This package provides @code{go-restful}, which helps
+developers to use @code{http} methods explicitly and in a way that's
+consistent with the HTTP protocol definition.")
+ (license license:expat)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b39548d478..d3c6252c88 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4382,30 +4382,6 @@ (define-public go-github-com-blang-semver
(description "Semver is a library for Semantic versioning written in Go.")
(license license:expat))))
-(define-public go-github-com-emicklei-go-restful
- (package
- (name "go-github-com-emicklei-go-restful")
- (version "3.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emicklei/go-restful")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/emicklei/go-restful"))
- (home-page "https://github.com/emicklei/go-restful")
- (synopsis "Build REST-style web services using Go")
- (description "This package provides @code{go-restful}, which helps
-developers to use @code{http} methods explicitly and in a way that's consistent
-with the HTTP protocol definition.")
- (license license:expat)))
-
(define-public go-cloud-google-com-go-compute-metadata
(package
(name "go-cloud-google-com-go-compute-metadata")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 35/66] gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4d2b3e872806e4178ea6abada0739a0da72e4e25.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-julienschmidt-httprouter): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

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

Toggle diff (93 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 2570be62f7..c501f55685 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,9 +6,9 @@
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
@@ -631,6 +631,29 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-julienschmidt-httprouter
+ (package
+ (name "go-github-com-julienschmidt-httprouter")
+ (version "1.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/julienschmidt/httprouter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/julienschmidt/httprouter"))
+ (home-page "https://github.com/julienschmidt/httprouter")
+ (synopsis "High performance HTTP request router")
+ (description
+ "Package @code{httprouter} is a trie based high performance HTTP request
+router.")
+ (license license:bsd-3)))
+
(define-public go-github-com-microcosm-cc-bluemonday
(package
(name "go-github-com-microcosm-cc-bluemonday")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ce67f02387..b39548d478 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9465,29 +9465,6 @@ (define-public go-github-com-juju-ansiterm
for color and styles.")
(license license:lgpl3)))
-(define-public go-github-com-julienschmidt-httprouter
- (package
- (name "go-github-com-julienschmidt-httprouter")
- (version "1.3.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/julienschmidt/httprouter")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/julienschmidt/httprouter"))
- (home-page "https://github.com/julienschmidt/httprouter")
- (synopsis "High performance HTTP request router")
- (description
- "Package @code{httprouter} is a trie based high performance HTTP request
-router.")
- (license license:bsd-3)))
-
(define-public go-github-com-kevinburke-ssh-config
(package
(name "go-github-com-kevinburke-ssh-config")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index 553095cb75..6808bcd597 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -35,6 +35,7 @@ (define-module (gnu packages high-availability)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages hardware)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 34/66] gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
09116239ac1a758100f6fa6b2cd6ba40ef7d7ba4.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-go-chi-chi-v5): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (90 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index f59415452f..2570be62f7 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,17 +1,17 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
-;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -284,6 +284,29 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-go-chi-chi-v5
+ (package
+ (name "go-github-com-go-chi-chi-v5")
+ (version "5.0.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-chi/chi")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/go-chi/chi/v5"))
+ (home-page "https://github.com/go-chi/chi")
+ (synopsis "Composable router for HTTP services written in Go")
+ (description
+ "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
+decompose request handling into many smaller layers.")
+ (license license:expat)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 100e59e154..ce67f02387 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11981,29 +11981,6 @@ (define-public go-github-com-dreamacro-go-shadowsocks2
@end itemize")
(license license:asl2.0)))
-(define-public go-github-com-go-chi-chi-v5
- (package
- (name "go-github-com-go-chi-chi-v5")
- (version "5.0.7")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-chi/chi")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/go-chi/chi/v5"))
- (home-page "https://github.com/go-chi/chi")
- (synopsis "Composable router for HTTP services written in Go")
- (description
- "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
-decompose request handling into many smaller layers.")
- (license license:expat)))
-
(define-public go-sigs-k8s-io-yaml
(package
(name "go-sigs-k8s-io-yaml")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 37/66] gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
1cee6bf69e7388e75ccfac6e988a2b8353af64a7.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-tv42-httpunix): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4cef7b6641..caccb126bc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -831,6 +832,30 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-github-com-tv42-httpunix
+ (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22")
+ (revision "0"))
+ (package
+ (name "go-github-com-tv42-httpunix")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tv42/httpunix")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/tv42/httpunix"))
+ (home-page "https://github.com/tv42/httpunix")
+ (synopsis "Go library to talk HTTP over Unix domain sockets")
+ (description "This package is a Go library to talk HTTP over Unix domain
+sockets.")
+ (license license:expat))))
+
(define-public go-github-com-valyala-fasthttp
(package
(name "go-github-com-valyala-fasthttp")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d3c6252c88..310c2ba8f4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4334,30 +4334,6 @@ (define-public go-github-com-tomnomnom-gron
absolute \"path\" to it.")
(license license:expat)))
-(define-public go-github-com-tv42-httpunix
- (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22")
- (revision "0"))
- (package
- (name "go-github-com-tv42-httpunix")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/tv42/httpunix")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/tv42/httpunix"))
- (home-page "https://github.com/tv42/httpunix")
- (synopsis "Go library to talk HTTP over Unix domain sockets")
- (description "This package is a Go library to talk HTTP over Unix domain
-sockets.")
- (license license:expat))))
-
(define-public go-github-com-blang-semver
(let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 40/66] gnu: go-github-com-francoispqt-gojay: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
abb778b788321f7ebbf4f5423ac21d8504da1f74.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-francoispqt-gojay):
[propagated-inputs]: Swap to [native-inputs].

Change-Id: Ie83ea13685036b2688f668cde8bbb831ba5cd602
---
gnu/packages/golang-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 2790e2b5aa..59312f791a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -326,7 +326,7 @@ (define-public go-github-com-francoispqt-gojay
(build-system go-build-system)
(arguments
'(#:import-path "github.com/francoispqt/gojay"))
- (propagated-inputs
+ (native-inputs
(list go-github-com-stretchr-testify))
(synopsis "JSON encoder/decoder with powerful stream API for Golang")
(description "GoJay is a performant JSON encoder/decoder for Golang. It has
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 28/66] gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4d20b22dad0e67876e94360706d22ff25af28497.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-bep-golibsass): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: I514ae05a8c04eea2084cbcb7e4d84c83b6b71bb4
---
gnu/packages/golang-web.scm | 61 ++++++++++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 58 -----------------------------------
2 files changed, 60 insertions(+), 59 deletions(-)

Toggle diff (157 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9aa3fe8233..72f2a7d84c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -34,7 +35,8 @@ (define-module (gnu packages golang-web)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages golang)
- #:use-module (gnu packages golang-check))
+ #:use-module (gnu packages golang-check)
+ #:use-module (gnu packages web))
;;; Commentary:
;;;
@@ -95,6 +97,63 @@ (define-public go-github-com-aymerick-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-bep-golibsass
+ (package
+ (name "go-github-com-bep-golibsass")
+ (version "0.7.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bep/golibsass")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "libsass_src")
+ #t))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/bep/golibsass/libsass"
+ #:unpack-path "github.com/bep/golibsass"
+ ;; The dev build tag modifies the build to link to system libsass
+ ;; instead of including the bundled one (which we remove.)
+ ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
+ #:build-flags '("-tags" "dev")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-bindings
+ ;; Generate bindings for system libsass, replacing the
+ ;; pre-generated bindings.
+ (lambda* (#:key inputs unpack-path #:allow-other-keys)
+ (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
+ (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src")))
+ (substitute* (string-append "src/" unpack-path "/gen/main.go")
+ (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
+ (string-append "\"" libsass-src "\""))
+ (("../../libsass_src/src/")
+ libsass-src)))
+ (invoke "go" "generate" (string-append unpack-path "/gen"))
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? import-path #:allow-other-keys)
+ (if tests?
+ (invoke "go" "test" import-path "-tags" "dev"))
+ #t)))))
+ (propagated-inputs
+ (list libsass))
+ (native-inputs
+ `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
+ ("libsass-src" ,(package-source libsass))))
+ (home-page "https://github.com/bep/golibsass")
+ (synopsis "Easy to use Go bindings for LibSass")
+ (description
+ "This package provides SCSS compiler support for Go applications.")
+ (license license:expat)))
+
(define-public go-github-com-chris-ramon-douceur
(package
(name "go-github-com-chris-ramon-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 89aeead50a..11032a6e7d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10372,64 +10372,6 @@ (define-public go-github-com-gologme-log
additions.")
(license license:bsd-3))))
-(define-public go-github-com-bep-golibsass
- (package
- (name "go-github-com-bep-golibsass")
- (version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bep/golibsass")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "libsass_src")
- #t))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/bep/golibsass/libsass"
- #:unpack-path "github.com/bep/golibsass"
- ;; The dev build tag modifies the build to link to system libsass
- ;; instead of including the bundled one (which we remove.)
- ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go
- #:build-flags '("-tags" "dev")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'generate-bindings
- ;; Generate bindings for system libsass, replacing the
- ;; pre-generated bindings.
- (lambda* (#:key inputs unpack-path #:allow-other-keys)
- (mkdir-p (string-append "src/" unpack-path "/internal/libsass"))
- (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src")))
- (substitute* (string-append "src/" unpack-path "/gen/main.go")
- (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)")
- (string-append "\"" libsass-src "\""))
- (("../../libsass_src/src/")
- libsass-src)))
- (invoke "go" "generate" (string-append unpack-path "/gen"))
- #t))
- (replace 'check
- (lambda* (#:key tests? import-path #:allow-other-keys)
- (if tests?
- (invoke "go" "test" import-path "-tags" "dev"))
- #t)))))
- (propagated-inputs
- (list libsass))
- (native-inputs
- `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest)
- ("libsass-src" ,(package-source libsass))))
- (home-page "https://github.com/bep/golibsass")
- (synopsis "Easy to use Go bindings for LibSass")
- (description
- "This package provides SCSS compiler support for Go applications.")
- (license license:expat)))
-
(define-public go-github-com-hashicorp-go-syslog
(package
(name "go-github-com-hashicorp-go-syslog")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 29/66] gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
af90e746231a7a204ff04b7489c15720f6d52fb2.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-gopkg-in-square-go-jose-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (82 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 72f2a7d84c..976179f44e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -683,6 +683,35 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-gopkg-in-square-go-jose-v2
+ (package
+ (name "go-gopkg-in-square-go-jose-v2")
+ (version "2.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/square/go-jose")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "gopkg.in/square/go-jose.v2"))
+ (propagated-inputs
+ (list go-golang-org-x-crypto))
+ (native-inputs
+ (list go-github-com-google-go-cmp-cmp
+ go-github-com-stretchr-testify))
+ (home-page "https://gopkg.in/square/go-jose.v2")
+ (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
+ (description
+ "This package aims to provide an implementation of the Javascript Object
+Signing and Encryption set of standards. This includes support for JSON Web
+Encryption, JSON Web Signature, and JSON Web Token standards.")
+ (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 11032a6e7d..d85612c800 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3223,35 +3223,6 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
-(define-public go-gopkg-in-square-go-jose-v2
- (package
- (name "go-gopkg-in-square-go-jose-v2")
- (version "2.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/square/go-jose")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "gopkg.in/square/go-jose.v2"))
- (propagated-inputs
- (list go-golang-org-x-crypto))
- (native-inputs
- (list go-github-com-google-go-cmp-cmp
- go-github-com-stretchr-testify))
- (home-page "https://gopkg.in/square/go-jose.v2")
- (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go")
- (description
- "This package aims to provide an implementation of the Javascript Object
-Signing and Encryption set of standards. This includes support for JSON Web
-Encryption, JSON Web Signature, and JSON Web Token standards.")
- (license license:asl2.0)))
-
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 32/66] gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
551bcbc82b8492d80fd531efd7db00bb69587b6d.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-sdk): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0219ffb5e5..352c831e41 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -71,6 +71,34 @@ (define-public go-github-com-andybalholm-cascadia
the parse trees produced by the html package.")
(license license:bsd-2)))
+(define-public go-github-com-aws-sdk
+ (package
+ (name "go-github-com-aws-sdk")
+ (version "1.35.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go/aws"
+ #:unpack-path "github.com/aws/aws-sdk-go"))
+ (propagated-inputs
+ (list go-github-com-go-sql-driver-mysql
+ go-github-com-jmespath-go-jmespath
+ go-github-com-pkg-errors
+ go-golang-org-x-net))
+ (home-page "https://github.com/aws/aws-sdk-go")
+ (synopsis "Library to access Amazon Web Services (AWS)")
+ (description
+ "This is the official AWS SDK for the Go programming language.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ad2bdf099d..1f1ca8694c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3195,34 +3195,6 @@ (define-public go-github-com-hebcal-hebcal-go
and anniversaries.")
(license license:gpl2+))))
-(define-public go-github-com-aws-sdk
- (package
- (name "go-github-com-aws-sdk")
- (version "1.35.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go/aws"
- #:unpack-path "github.com/aws/aws-sdk-go"))
- (propagated-inputs
- (list go-github-com-go-sql-driver-mysql
- go-github-com-jmespath-go-jmespath go-github-com-pkg-errors
- go-golang-org-x-net))
- (home-page "https://github.com/aws/aws-sdk-go")
- (synopsis "Library to access Amazon Web Services (AWS)")
- (description
- "This is the official AWS SDK for the Go programming language.")
- (license license:asl2.0)))
-
(define-public go-github-com-go-jose-go-jose-v3
(package
(inherit go-gopkg-in-square-go-jose-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 30/66] gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
f539dbd9d4cd81188c8b9835570bb9f8b0a01227.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 976179f44e..792406ab97 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -182,6 +182,33 @@ (define-public go-github-com-chris-ramon-douceur
(description "This package provides a CSS parser and inliner.")
(license license:expat)))
+(define-public go-github-com-coreos-go-oidc
+ (package
+ (name "go-github-com-coreos-go-oidc")
+ (version "2.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"))))
+ (build-system go-build-system)
+ (arguments
+ (list #:import-path "github.com/coreos/go-oidc"))
+ (propagated-inputs
+ (list go-github-com-pquerna-cachecontrol
+ go-golang-org-x-oauth2
+ go-gopkg-in-square-go-jose-v2))
+ (home-page "https://github.com/coreos/go-oidc")
+ (synopsis "OpenID Connect support for Go")
+ (description
+ "This package enables OpenID Connect support for the
+@code{go-golang-org-x-oauth2} package.")
+ (license license:asl2.0)))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d85612c800..92b01a696f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9243,33 +9243,6 @@ (define-public go-github-com-charmbracelet-glamour
use one of our glamorous default themes.")
(license license:expat)))
-(define-public go-github-com-coreos-go-oidc
- (package
- (name "go-github-com-coreos-go-oidc")
- (version "2.2.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-oidc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"))))
- (build-system go-build-system)
- (arguments
- (list #:import-path "github.com/coreos/go-oidc"))
- (propagated-inputs
- (list go-github-com-pquerna-cachecontrol
- go-golang-org-x-oauth2
- go-gopkg-in-square-go-jose-v2))
- (home-page "https://github.com/coreos/go-oidc")
- (synopsis "OpenID Connect support for Go")
- (description
- "This package enables OpenID Connect support for the
-@code{go-golang-org-x-oauth2} package.")
- (license license:asl2.0)))
-
(define-public go-github-com-coreos-go-oidc-v3
(package
(inherit go-github-com-coreos-go-oidc)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 31/66] gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b6de844b90e2145a4c81878d42d13be2c72b9ff9.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (68 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 792406ab97..0219ffb5e5 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -209,6 +209,28 @@ (define-public go-github-com-coreos-go-oidc
@code{go-golang-org-x-oauth2} package.")
(license license:asl2.0)))
+(define-public go-github-com-coreos-go-oidc-v3
+ (package
+ (inherit go-github-com-coreos-go-oidc)
+ (name "go-github-com-coreos-go-oidc-v3")
+ (version "3.6.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
+ (arguments
+ (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
+ #:import-path "github.com/coreos/go-oidc/v3/oidc"
+ #:unpack-path "github.com/coreos/go-oidc/v3"))
+ (propagated-inputs
+ (list go-github-com-go-jose-go-jose-v3
+ go-golang-org-x-oauth2))))
+
(define-public go-github-com-felixge-httpsnoop
(package
(name "go-github-com-felixge-httpsnoop")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 92b01a696f..ad2bdf099d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9243,28 +9243,6 @@ (define-public go-github-com-charmbracelet-glamour
use one of our glamorous default themes.")
(license license:expat)))
-(define-public go-github-com-coreos-go-oidc-v3
- (package
- (inherit go-github-com-coreos-go-oidc)
- (name "go-github-com-coreos-go-oidc-v3")
- (version "3.6.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coreos/go-oidc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
- (arguments
- (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
- #:import-path "github.com/coreos/go-oidc/v3/oidc"
- #:unpack-path "github.com/coreos/go-oidc/v3"))
- (propagated-inputs
- (list go-github-com-go-jose-go-jose-v3
- go-golang-org-x-oauth2))))
-
(define-public go-github-com-coreos-go-semver
(package
(name "go-github-com-coreos-go-semver")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 33/66] gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
40be7c880f40147a227d5a40b9282ee5087155fd.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-valyala-fasthttp): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (112 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 352c831e41..f59415452f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -760,6 +761,46 @@ (define-public go-github-com-tdewolff-parse-v2
"This package contains several lexers and parsers written in Go.")
(license license:expat)))
+(define-public go-github-com-valyala-fasthttp
+ (package
+ (name "go-github-com-valyala-fasthttp")
+ (version "1.39.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/valyala/fasthttp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/valyala/fasthttp"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; Tests hang forever with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (propagated-inputs
+ (list go-github-com-andybalholm-brotli
+ go-github-com-klauspost-compress
+ go-github-com-valyala-bytebufferpool
+ go-github-com-valyala-tcplisten
+ go-golang-org-x-crypto
+ go-golang-org-x-net
+ go-golang-org-x-sys))
+ (home-page "https://github.com/valyala/fasthttp")
+ (synopsis "Provides fast HTTP server and client API")
+ (description
+ "This package provides a Go module @code{fasthttp} which may be used as
+replacement for native @code{net/http} module.")
+ (license license:expat)))
+
(define-public go-gopkg-in-square-go-jose-v2
(package
(name "go-gopkg-in-square-go-jose-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1f1ca8694c..100e59e154 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11168,46 +11168,6 @@ (define-public go-github-com-valyala-bytebufferpool
anti-fragmentation protection.")
(license license:expat)))
-(define-public go-github-com-valyala-fasthttp
- (package
- (name "go-github-com-valyala-fasthttp")
- (version "1.39.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/valyala/fasthttp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1"))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/valyala/fasthttp"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; Tests hang forever with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (propagated-inputs
- (list go-golang-org-x-sys
- go-golang-org-x-net
- go-golang-org-x-crypto
- go-github-com-valyala-tcplisten
- go-github-com-valyala-bytebufferpool
- go-github-com-klauspost-compress
- go-github-com-andybalholm-brotli))
- (home-page "https://github.com/valyala/fasthttp")
- (synopsis "Provides fast HTTP server and client API")
- (description
- "This package provides a Go module @code{fasthttp} which may be used as
-replacement for native @code{net/http} module.")
- (license license:expat)))
-
(define-public go-github-com-valyala-tcplisten
(package
(name "go-github-com-valyala-tcplisten")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 38/66] gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
be370454b3e58428c10eed594430a65abc71d643.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-opentracing-opentracing-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (80 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index caccb126bc..d021be005f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
@@ -703,6 +704,30 @@ (define-public go-github-com-microcosm-cc-bluemonday
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-opentracing-opentracing-go
+ (package
+ (name "go-github-com-opentracing-opentracing-go")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/opentracing/opentracing-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/opentracing/opentracing-go"))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
+ (home-page "https://github.com/opentracing/opentracing-go")
+ (synopsis "OpenTracing API for Go")
+ (description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
+ (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 310c2ba8f4..69efe7c6bf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1798,30 +1798,6 @@ (define-public go-github-com-mufti1-interconv
(description "InterConv converts interfaces into any data type.")
(license license:expat))))
-(define-public go-github-com-opentracing-opentracing-go
- (package
- (name "go-github-com-opentracing-opentracing-go")
- (version "1.2.0")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/opentracing/opentracing-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/opentracing/opentracing-go"))
- (native-inputs
- (list go-github-com-stretchr-testify))
- (home-page "https://github.com/opentracing/opentracing-go")
- (synopsis "OpenTracing API for Go")
- (description "OpenTracing-Go is a Go implementation of the OpenTracing API.")
- (license license:asl2.0)))
-
(define-public go-github-com-operatorfoundation-monolith-go
(package
(name "go-github-com-operatorfoundation-monolith-go")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 39/66] gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
187f00eb075e5f421ca3379c11d54c0480b2210e.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-francoispqt-gojay): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (85 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index d021be005f..2790e2b5aa 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -5,9 +5,9 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
@@ -310,6 +310,31 @@ (define-public go-github-com-felixge-httpsnoop
application's http.Handlers.")
(license license:expat)))
+(define-public go-github-com-francoispqt-gojay
+ (package
+ (name "go-github-com-francoispqt-gojay")
+ (version "1.2.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/francoispqt/gojay")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/francoispqt/gojay"))
+ (propagated-inputs
+ (list go-github-com-stretchr-testify))
+ (synopsis "JSON encoder/decoder with powerful stream API for Golang")
+ (description "GoJay is a performant JSON encoder/decoder for Golang. It has
+a simple API and doesn't use reflection. It relies on small interfaces to
+decode/encode structures and slices.")
+ (home-page "https://github.com/francoispqt/gojay")
+ (license license:expat)))
+
(define-public go-github-com-go-chi-chi-v5
(package
(name "go-github-com-go-chi-chi-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 69efe7c6bf..1b5f7be13b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7354,31 +7354,6 @@ (define-public go-github-com-lunixbochs-vtclean
optionally preserving color.")
(license license:expat)))
-(define-public go-github-com-francoispqt-gojay
- (package
- (name "go-github-com-francoispqt-gojay")
- (version "1.2.13")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/francoispqt/gojay")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/francoispqt/gojay"))
- (propagated-inputs
- (list go-github-com-stretchr-testify))
- (synopsis "JSON encoder/decoder with powerful stream API for Golang")
- (description "GoJay is a performant JSON encoder/decoder for Golang. It has
-a simple API and doesn't use reflection. It relies on small interfaces to
-decode/encode structures and slices.")
- (home-page "https://github.com/francoispqt/gojay")
- (license license:expat)))
-
(define-public go-github-com-pkg-errors
(package
(name "go-github-com-pkg-errors")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 42/66] gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
c56bc069bb78089b5c3adef41864ab77c9a0ad71.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-jmespath-go-jmespath): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (78 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e92e04979e..9f7b0e39dc 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -704,6 +704,33 @@ (define-public go-github-com-jcmturner-gokrb5-v8
Microsoft AD PAC authorization data.")
(license license:asl2.0)))
+(define-public go-github-com-jmespath-go-jmespath
+ (package
+ (name "go-github-com-jmespath-go-jmespath")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jmespath/go-jmespath")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/jmespath/go-jmespath"))
+ (native-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib
+ go-gopkg-in-yaml-v2))
+ (home-page "https://github.com/jmespath/go-jmespath")
+ (synopsis "Golang implementation of JMESPath")
+ (description
+ "This package implements JMESPath, a query language for JSON. It
+transforms one JSON document into another through a JMESPath expression.")
+ (license license:asl2.0)))
+
(define-public go-github-com-julienschmidt-httprouter
(package
(name "go-github-com-julienschmidt-httprouter")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index aa1a82f92d..b493000159 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8826,33 +8826,6 @@ (define-public go-github-com-alecthomas-chroma
converts it into syntax highlighted HTML, ANSI-coloured text, etc.")
(license license:expat)))
-(define-public go-github-com-jmespath-go-jmespath
- (package
- (name "go-github-com-jmespath-go-jmespath")
- (version "0.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jmespath/go-jmespath")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/jmespath/go-jmespath"))
- (native-inputs
- (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib
- go-gopkg-in-yaml-v2))
- (home-page "https://github.com/jmespath/go-jmespath")
- (synopsis "Golang implementation of JMESPath")
- (description
- "This package implements JMESPath, a query language for JSON. It
-transforms one JSON document into another through a JMESPath expression.")
- (license license:asl2.0)))
-
(define-public go-github-com-muesli-reflow-wordwrap
(package
(name "go-github-com-muesli-reflow-wordwrap")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 41/66] gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3543ee1f9bacb566d0d9e7c57916a203ee4f277f.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-goccy-go-json): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 59312f791a..e92e04979e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org>
;;; Copyright © 2022 muradm <mail@muradm.net>
@@ -358,6 +359,27 @@ (define-public go-github-com-go-chi-chi-v5
decompose request handling into many smaller layers.")
(license license:expat)))
+(define-public go-github-com-goccy-go-json
+ (package
+ (name "go-github-com-goccy-go-json")
+ (version "0.9.10")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/goccy/go-json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/goccy/go-json"))
+ (home-page "https://github.com/goccy/go-json")
+ (synopsis "JSON encoder/decoder in Go")
+ (description "Fast JSON encoder/decoder compatible with encoding/json for Go.")
+ (license license:expat)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1b5f7be13b..aa1a82f92d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4038,28 +4038,6 @@ (define-public go-github-com-burntsushi-toml
is similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-goccy-go-json
- (package
- (name "go-github-com-goccy-go-json")
- (version "0.9.10")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/goccy/go-json")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/goccy/go-json"))
- (home-page "https://github.com/goccy/go-json")
- (synopsis "JSON encoder/decoder in Go")
- (description
- "Fast JSON encoder/decoder compatible with encoding/json for Go.")
- (license license:expat)))
-
(define-public go-github-com-getsentry-raven-go
(let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 43/66] gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d5a3f901f3e21279b21a965d04bfecbff2d5f05a.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-smithy-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (72 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9f7b0e39dc..c23e6df581 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -104,6 +104,30 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-smithy-go
+ (package
+ (name "go-github-com-aws-smithy-go")
+ (version "1.13.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/smithy-go")
+ (commit "v1.13.5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/smithy-go"))
+ (propagated-inputs
+ (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
+ (home-page "https://github.com/aws/smithy-go")
+ (synopsis "Smithy code generators for Go")
+ (description
+ "Package smithy provides the core components for a Smithy SDK.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aymerick-douceur
(package
(name "go-github-com-aymerick-douceur")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b493000159..0e821306f2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,30 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-smithy-go
- (package
- (name "go-github-com-aws-smithy-go")
- (version "1.13.5")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/smithy-go")
- (commit "v1.13.5")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/smithy-go"))
- (propagated-inputs
- (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
- (home-page "https://github.com/aws/smithy-go")
- (synopsis "Smithy code generators for Go")
- (description
- "Package smithy provides the core components for a Smithy SDK.")
- (license license:asl2.0)))
-
(define-public go-github-com-aws-aws-sdk-go-v2
(package
(name "go-github-com-aws-aws-sdk-go-v2")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 44/66] gnu: go-github-com-aws-smithy-go: Adjust description.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
185da3e05bb58844e9be123b05b558f7b7b1f0d9.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-aws-smithy-go):[description]
Add link to Smithy.

Change-Id: I3c913db5940dc97fb3fa8874fd8b1bf9baaf4a59
---
gnu/packages/golang-web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c23e6df581..ae9ffd3fd2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -123,7 +123,8 @@ (define-public go-github-com-aws-smithy-go
(propagated-inputs
(list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp))
(home-page "https://github.com/aws/smithy-go")
- (synopsis "Smithy code generators for Go")
+ (synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators
+for Go")
(description
"Package smithy provides the core components for a Smithy SDK.")
(license license:asl2.0)))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 45/66] gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
84ff2437892a27dc2f99c71983dfe35f96ec7559.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/version-control.scm: Add (gnu packages golang-web) module.

Change-Id: I6e980749d9f9c1373adfc717b0195a1b8c32d6af
---
gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++
gnu/packages/golang.scm | 25 -------------------------
gnu/packages/version-control.scm | 1 +
3 files changed, 27 insertions(+), 25 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ae9ffd3fd2..1542c409fe 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -104,6 +104,32 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-aws-sdk-go-v2
+ (package
+ (name "go-github-com-aws-aws-sdk-go-v2")
+ (version "1.17.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go-v2")
+ (commit "v1.17.3")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go
+ go-github-com-google-go-cmp-cmp
+ go-github-com-jmespath-go-jmespath))
+ (home-page "https://github.com/aws/aws-sdk-go-v2")
+ (synopsis "AWS SDK for Go v2")
+ (description
+ "Package sdk is the official AWS SDK v2 for the Go programming language.")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0e821306f2..a02da0fb49 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,31 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2
- (package
- (name "go-github-com-aws-aws-sdk-go-v2")
- (version "1.17.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go-v2")
- (commit "v1.17.3")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-jmespath-go-jmespath
- go-github-com-google-go-cmp-cmp
- go-github-com-aws-smithy-go))
- (home-page "https://github.com/aws/aws-sdk-go-v2")
- (synopsis "AWS SDK for Go v2")
- (description
- "Package sdk is the official AWS SDK v2 for the Go programming language.")
- (license license:asl2.0)))
-
(define-public go-github-com-aws-aws-sdk-go-v2-config
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cf9a2f7a4c..ffd4feb73d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -105,6 +105,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-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 47/66] gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e9fbd1458b8744b468ed22d11949a749c8282d9a.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (47 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7ecdcbd8b5..fde9a89ea3 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -158,6 +158,18 @@ (define-public go-github-com-aws-aws-sdk-go-v2
"Package sdk is the official AWS SDK v2 for the Go programming language.")
(license license:asl2.0)))
+(define-public go-github-com-aws-aws-sdk-go-v2-config
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-config")
+ (version "1.18.5")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-google-go-cmp-cmp
+ go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d631973702..98753c17b4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,17 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-config
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-config")
- (version "1.18.5")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/config"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-google-go-cmp-cmp
- go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 46/66] gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
96d9307979423bfe84bd35d82655654b72f1d8ad.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (84 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1542c409fe..7ecdcbd8b5 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
@@ -104,6 +105,33 @@ (define-public go-github-com-aws-sdk
"This is the official AWS SDK for the Go programming language.")
(license license:asl2.0)))
+;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not
+;; in use anywhere. Keep it here for the farther review.
+(define-public go-github-com-aws-aws-sdk-go
+ (package
+ (name "go-github-com-aws-aws-sdk-go")
+ (version "1.36.18")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aws/aws-sdk-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
+ (build-system go-build-system)
+ (propagated-inputs
+ (list go-github-com-jmespath-go-jmespath))
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go"
+ #:phases %standard-phases))
+ (synopsis "The official AWS SDK for the Go programming language")
+ (description
+ "The official AWS SDK for the Go programming language.")
+ (home-page "https://github.com/aws/aws-sdk-go")
+ (license license:asl2.0)))
+
(define-public go-github-com-aws-aws-sdk-go-v2
(package
(name "go-github-com-aws-aws-sdk-go-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a02da0fb49..d631973702 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11550,31 +11550,6 @@ (define-public go-github-com-mtibben-androiddnsfix
(define-public go-github-com-androiddnsfix
(deprecated-package "go-github-com-androiddnsfix" go-github-com-mtibben-androiddnsfix))
-(define-public go-github-com-aws-aws-sdk-go
- (package
- (name "go-github-com-aws-aws-sdk-go")
- (version "1.36.18")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/aws/aws-sdk-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9"))))
- (build-system go-build-system)
- (propagated-inputs
- (list go-github-com-jmespath-go-jmespath))
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go"
- #:phases %standard-phases))
- (synopsis "The official AWS SDK for the Go programming language")
- (description
- "The official AWS SDK for the Go programming language.")
- (home-page "https://github.com/aws/aws-sdk-go")
- (license license:asl2.0)))
-
(define-public go-gopkg-in-ini
(package
(name "go-gopkg-in-ini")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 48/66] gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
966e8e64ae05a89f82b7bbcdc797881feacaaca4.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index fde9a89ea3..bfda5ffa31 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -170,6 +170,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
(list go-github-com-google-go-cmp-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
+ (version "1.44.161")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 98753c17b4..0099531302 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,16 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-iam")
- (version "1.44.161")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 49/66] gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
4ce77cdfc48e1e7a16024c0a53f9a4d78742ce2f.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index bfda5ffa31..5dd73bd4db 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -181,6 +181,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
+ (version "1.11.27")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0099531302..32756ad0ce 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,16 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-sso")
- (version "1.11.27")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 50/66] gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0c5054210b3e309c90ee35e2064b27acc913315a.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5dd73bd4db..4bc9c944cb 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -192,6 +192,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
+ (version "1.13.10")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 32756ad0ce..0ef1ba4edf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,16 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc")
- (version "1.13.10")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 51/66] gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ace1351970901aa7228a744b37ca2176cb933f6e.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4bc9c944cb..aadf8ac73e 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -203,6 +203,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
+ (version "1.17.7")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-smithy-go
(package
(name "go-github-com-aws-smithy-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0ef1ba4edf..5aedd1d51e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,16 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-sts
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-sts")
- (version "1.17.7")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 52/66] gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
5f837fd28e82a422449cfcddcdebbd719f1380ae.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-s3): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (45 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index aadf8ac73e..e87634cdaa 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -181,6 +181,17 @@ (define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(propagated-inputs
(list go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-service-s3")
+ (version "1.30.0")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs
+ (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-aws-sdk-go-v2-service-sso
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5aedd1d51e..05d072f1e5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,16 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-service-s3
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-service-s3")
- (version "1.30.0")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 53/66] gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a551b00ced82d9de311c0ca347327dd3ae647823.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-feature-s3-manager): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (44 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e87634cdaa..616a14fdf1 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -170,6 +170,16 @@ (define-public go-github-com-aws-aws-sdk-go-v2-config
(list go-github-com-google-go-cmp-cmp
go-github-com-aws-smithy-go))))
+(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
+ (package
+ (inherit go-github-com-aws-aws-sdk-go-v2)
+ (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager")
+ (version "1.11.44")
+ (arguments
+ '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
+ #:unpack-path "github.com/aws/aws-sdk-go-v2"))
+ (propagated-inputs (list go-github-com-aws-smithy-go))))
+
(define-public go-github-com-aws-aws-sdk-go-v2-service-iam
(package
(inherit go-github-com-aws-aws-sdk-go-v2)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 05d072f1e5..205987cf36 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11300,16 +11300,6 @@ (define-public go-github-com-dvsekhvalnov-jose2go
(home-page "https://github.com/dvsekhvalnov/jose2go")
(license license:expat)))
-(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
- (package
- (inherit go-github-com-aws-aws-sdk-go-v2)
- (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager")
- (version "1.11.44")
- (arguments
- '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
- #:unpack-path "github.com/aws/aws-sdk-go-v2"))
- (propagated-inputs (list go-github-com-aws-smithy-go))))
-
(define-public aws-vault
(package
(name "aws-vault")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 55/66] gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3836cb7c4953e003c740f78835dda99400a0a7e2.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Change-Id: If1ba5e4d866ce74fa35ae9126c6ba4cd0b149dab
---
gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++
gnu/packages/golang.scm | 24 ------------------------
gnu/packages/networking.scm | 1 +
gnu/packages/uucp.scm | 1 +
4 files changed, 26 insertions(+), 24 deletions(-)

Toggle diff (103 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 96873f020c..4771657add 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
@@ -757,6 +758,29 @@ (define-public go-github-com-gorilla-websocket
protocol.")
(license license:bsd-2)))
+(define-public go-github-com-hjson-hjson-go
+ (package
+ (name "go-github-com-hjson-hjson-go")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hjson/hjson-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/hjson/hjson-go"))
+ (home-page "https://hjson.org/")
+ (synopsis "Human JSON implementation for Go")
+ (description "Hjson is a syntax extension to JSON. It is intended to be
+used like a user interface for humans, to read and edit before passing the
+JSON data to the machine.")
+ (license license:expat)))
+
(define-public go-github-com-jcmturner-dnsutils-v2
(package
(name "go-github-com-jcmturner-dnsutils-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3236abdec6..38398b111b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10092,30 +10092,6 @@ (define-public go-github-com-hashicorp-go-syslog
(description "This package is a very simple wrapper around log/syslog")
(license license:expat)))
-(define-public go-github-com-hjson-hjson-go
- (package
- (name "go-github-com-hjson-hjson-go")
- (version "4.3.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/hjson/hjson-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/hjson/hjson-go"))
- (home-page "https://hjson.org/")
- (synopsis "Human JSON implementation for Go")
- (description "Hjson is a syntax extension to JSON. It is intended to be
-used like a user interface for humans, to read and edit before passing the
-JSON data to the machine.")
- (license license:expat)))
-
(define-public go-golang-zx2c4-com-wireguard
(package
(name "go-golang-zx2c4-com-wireguard")
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6b415076e8..2366dd5fc5 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -123,6 +123,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm
index e10de59aa2..1626c90c36 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-web)
#:use-module (gnu packages texinfo)
#:use-module (guix licenses)
#:use-module (guix packages)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 56/66] gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d1953c6285687af88e9f63bec76c2330160380a7.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonschema): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (105 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4771657add..c97dfa7757 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,47 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-xeipuuv-gojsonschema
+ (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonschema")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonschema")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonschema"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (substitute* "schema_test.go"
+ (("\\{\"phase\": \"remote ref, " all)
+ (string-append "// " all))
+ (("\\{\"phase\": \"valid definition" all)
+ (string-append "// " all))
+ (("\\{\"phase\": \"invalid definition" all)
+ (string-append "// " all)))))))))
+ (propagated-inputs
+ (list go-github-com-xeipuuv-gojsonreference
+ go-github-com-xeipuuv-gojsonpointer
+ go-github-com-stretchr-testify))
+ (home-page "https://github.com/xeipuuv/gojsonschema")
+ (synopsis "Implementation of JSON Schema for Go")
+ (description
+ "This package provides an implementation of JSON Schema for the Go
+programming language, which supports draft-04, draft-06 and draft-07.")
+ (license license:asl2.0))))
+
(define-public go-gopkg-in-square-go-jose-v2
(package
(name "go-gopkg-in-square-go-jose-v2")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 38398b111b..ee4cef4887 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12303,46 +12303,6 @@ (define-public go-github-com-xeipuuv-gojsonreference
programming language.")
(license license:asl2.0))))
-(define-public go-github-com-xeipuuv-gojsonschema
- (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonschema")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonschema")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonschema"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- (lambda* (#:key import-path #:allow-other-keys)
- (with-directory-excursion (string-append "src/" import-path)
- (substitute* "schema_test.go"
- (("\\{\"phase\": \"remote ref, " all)
- (string-append "// " all))
- (("\\{\"phase\": \"valid definition" all)
- (string-append "// " all))
- (("\\{\"phase\": \"invalid definition" all)
- (string-append "// " all)))))))))
- (propagated-inputs (list go-github-com-xeipuuv-gojsonreference
- go-github-com-xeipuuv-gojsonpointer
- go-github-com-stretchr-testify))
- (home-page "https://github.com/xeipuuv/gojsonschema")
- (synopsis "Implementation of JSON Schema for Go")
- (description
- "This package provides an implementation of JSON Schema for the Go
-programming language, which supports draft-04, draft-06 and draft-07.")
- (license license:asl2.0))))
-
(define-public go-github-com-niemeyer-pretty
(package
(name "go-github-com-niemeyer-pretty")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 57/66] gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b3a7c1384cd3f43266b32a1174f1f8e624fd2719.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang-web.scm (go-github-com-xeipuuv-gojsonschema):
[propagated-inputs]: Move go-github-com-stretchr-testify from here ...
[native-inputs]: ... to here.

Change-Id: Id865d5821060cd847aeb9ccfc7b7a477e12f7b7b
---
gnu/packages/golang-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c97dfa7757..346ca87cc7 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1232,10 +1232,11 @@ (define-public go-github-com-xeipuuv-gojsonschema
(string-append "// " all))
(("\\{\"phase\": \"invalid definition" all)
(string-append "// " all)))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-xeipuuv-gojsonreference
- go-github-com-xeipuuv-gojsonpointer
- go-github-com-stretchr-testify))
+ go-github-com-xeipuuv-gojsonpointer))
(home-page "https://github.com/xeipuuv/gojsonschema")
(synopsis "Implementation of JSON Schema for Go")
(description
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 54/66] gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
47bbfa7f3f082937ddf617ba5438e28793781e4e.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-nwidger-jsoncolor): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (85 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 616a14fdf1..96873f020c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
+;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -934,6 +935,32 @@ (define-public go-github-com-microcosm-cc-bluemonday
(description "@code{bluemonday} is a HTML sanitizer implemented in Go.")
(license license:bsd-3)))
+(define-public go-github-com-nwidger-jsoncolor
+ (package
+ (name "go-github-com-nwidger-jsoncolor")
+ (version "0.3.0")
+ (home-page "https://github.com/nwidger/jsoncolor")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/nwidger/jsoncolor"))
+ (native-inputs
+ (list go-github-com-fatih-color))
+ (synopsis "Colorized JSON marshalling and encoding")
+ (description
+ "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s
+@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type
+which produce colorized output using github.com/fatih/color.")
+ (license license:expat)))
+
(define-public go-github-com-opentracing-opentracing-go
(package
(name "go-github-com-opentracing-opentracing-go")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 205987cf36..3236abdec6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8913,33 +8913,6 @@ (define-public go-github-com-muesli-termenv
escape sequences and color conversions.")
(license license:expat)))
-(define-public go-github-com-nwidger-jsoncolor
- (package
- (name "go-github-com-nwidger-jsoncolor")
- (version "0.3.0")
- (home-page "https://github.com/nwidger/jsoncolor")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/nwidger/jsoncolor"))
- (native-inputs
- (list go-github-com-fatih-color))
- (synopsis "Colorized JSON marshalling and encoding")
- (description
- "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s
-@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type
-which produce colorized output using github.com/fatih/color.")
- (license license:expat)))
-
(define-public go-github-com-olekukonko-tablewriter
(package
(name "go-github-com-olekukonko-tablewriter")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 58/66] gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7131fac2dd5e2d08ead824ad80ef80b80bbc441e.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonpointer): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: I1c77a5a1b0e85fa57578ff29c9e3c403e4d62bc8
---
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 346ca87cc7..1f9fe0ffca 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,31 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-xeipuuv-gojsonpointer
+ (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonpointer")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonpointer")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonpointer"))
+ (home-page "https://github.com/xeipuuv/gojsonpointer")
+ (synopsis "Implementation of JSON Pointer for Go")
+ (description
+ "This package provides an implementation of JSON Pointer for the Go
+programming language.")
+ (license license:asl2.0))))
+
(define-public go-github-com-xeipuuv-gojsonschema
(let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ee4cef4887..feb1161e3f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12252,31 +12252,6 @@ (define-public go-github-com-go-test-deep
when comparing complex types like structures and maps.")
(license license:expat)))
-(define-public go-github-com-xeipuuv-gojsonpointer
- (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonpointer")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonpointer")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonpointer"))
- (home-page "https://github.com/xeipuuv/gojsonpointer")
- (synopsis "Implementation of JSON Pointer for Go")
- (description
- "This package provides an implementation of JSON Pointer for the Go
-programming language.")
- (license license:asl2.0))))
-
(define-public go-github-com-xeipuuv-gojsonreference
(let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 59/66] gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
d4bd62331af8fd7a3172b178470ae1cc3f1e2038.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonreference): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (77 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 1f9fe0ffca..7f6ced049c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1227,6 +1227,33 @@ (define-public go-github-com-xeipuuv-gojsonpointer
programming language.")
(license license:asl2.0))))
+(define-public go-github-com-xeipuuv-gojsonreference
+ (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
+ (revision "0"))
+ (package
+ (name "go-github-com-xeipuuv-gojsonreference")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xeipuuv/gojsonreference")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/xeipuuv/gojsonreference"))
+ (propagated-inputs
+ (list go-github-com-xeipuuv-gojsonpointer))
+ (home-page "https://github.com/xeipuuv/gojsonreference")
+ (synopsis "Implementation of JSON Reference for Go")
+ (description
+ "This package provides an implementation of JSON Reference for the Go
+programming language.")
+ (license license:asl2.0))))
+
(define-public go-github-com-xeipuuv-gojsonschema
(let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index feb1161e3f..00a0e4c933 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12252,32 +12252,6 @@ (define-public go-github-com-go-test-deep
when comparing complex types like structures and maps.")
(license license:expat)))
-(define-public go-github-com-xeipuuv-gojsonreference
- (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b")
- (revision "0"))
- (package
- (name "go-github-com-xeipuuv-gojsonreference")
- (version (git-version "0.0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/xeipuuv/gojsonreference")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/xeipuuv/gojsonreference"))
- (propagated-inputs (list go-github-com-xeipuuv-gojsonpointer))
- (home-page "https://github.com/xeipuuv/gojsonreference")
- (synopsis "Implementation of JSON Reference for Go")
- (description
- "This package provides an implementation of JSON Reference for the Go
-programming language.")
- (license license:asl2.0))))
-
(define-public go-github-com-niemeyer-pretty
(package
(name "go-github-com-niemeyer-pretty")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 60/66] gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
0631e18f99f505f5dfd96d6284a4ab65535cf696.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-whyrusleeping-json-filter): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (75 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7f6ced049c..fbfa1049a4 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1202,6 +1202,31 @@ (define-public go-github-com-valyala-fasthttp
replacement for native @code{net/http} module.")
(license license:expat)))
+(define-public go-github-com-whyrusleeping-json-filter
+ (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
+ (revision "0"))
+ (package
+ (name "go-github-com-whyrusleeping-json-filter")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/whyrusleeping/json-filter")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path
+ "github.com/whyrusleeping/json-filter"))
+ (home-page "https://github.com/whyrusleeping/json-filter")
+ (synopsis "Library to query JSON objects marshalled into map[string]interface")
+ (description "A library to query JSON objects marshalled into
+@command{map[string]interface{}}.")
+ (license license:expat))))
+
(define-public go-github-com-xeipuuv-gojsonpointer
(let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6")
(revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 00a0e4c933..1fb656c547 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6546,32 +6546,6 @@ (define-public go-github-com-pmezard-go-difflib
(description "This package provides unified and context-aware diffs in Go.")
(license license:bsd-3)))
-(define-public go-github-com-whyrusleeping-json-filter
- (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
- (revision "0"))
- (package
- (name "go-github-com-whyrusleeping-json-filter")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/whyrusleeping/json-filter")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path
- "github.com/whyrusleeping/json-filter"))
- (home-page "https://github.com/whyrusleeping/json-filter")
- (synopsis "Library to query JSON objects marshalled into map[string]interface")
- (description "A library to query JSON objects marshalled into
-@command{map[string]interface{}}.")
- (license license:expat))))
-
(define-public go-github-com-whyrusleeping-progmeter
(let ((commit "f3e57218a75b913eff88d49a52c1debf9684ea04")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 61/66] gnu: go-github-com-stretchr-objx: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e225c3e78a6312d41cc4810190ecb7804ec718b6.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-stretchr-objx,
go-github-com-stretchr-testify-bootstrap): Move from here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (134 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 42e501a6e3..b74864d808 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -378,6 +378,46 @@ (define-public go-github-com-onsi-ginkgo
Gomega matcher library.")
(license license:expat)))
+(define-public go-github-com-stretchr-objx
+ (package
+ (name "go-github-com-stretchr-objx")
+ (version "0.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stretchr/objx")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "vendor")))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/stretchr/objx"
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (unless
+ ;; The tests fail when run with gccgo.
+ (false-if-exception (search-input-file inputs "/bin/gccgo"))
+ (apply (assoc-ref %standard-phases 'check) args)))))))
+ (propagated-inputs
+ (list go-github-com-davecgh-go-spew
+ go-github-com-pmezard-go-difflib))
+ (inputs
+ (list go-github-com-stretchr-testify-bootstrap))
+ (home-page "https://github.com/stretchr/objx")
+ (synopsis "Go package for dealing with maps, slices, JSON and other data")
+ (description "This package provides a Go library for dealing with maps,
+slices, JSON and other data.")
+ (license license:expat)))
+
(define-public go-github-com-stretchr-testify
(package
(name "go-github-com-stretchr-testify")
@@ -414,6 +454,17 @@ (define-public go-github-com-stretchr-testify
@end itemize")
(license license:expat)))
+(define go-github-com-stretchr-testify-bootstrap
+ (package
+ (inherit go-github-com-stretchr-testify)
+ (arguments
+ '(#:import-path "github.com/stretchr/testify"
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ (delete 'build))))
+ (propagated-inputs
+ (list go-gopkg-in-yaml-v3))))
+
(define-public go-github-com-tdewolff-test
(package
(name "go-github-com-tdewolff-test")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1fb656c547..1870eadb9c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4146,58 +4146,6 @@ (define-public go-github-com-jpillora-backoff
Go.")
(license license:expat))))
-(define-public go-github-com-stretchr-objx
- (package
- (name "go-github-com-stretchr-objx")
- (version "0.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/stretchr/objx")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "vendor")))))
- (build-system go-build-system)
- (arguments
- (list
- #:import-path "github.com/stretchr/objx"
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (unless
- ;; The tests fail when run with gccgo.
- (false-if-exception (search-input-file inputs "/bin/gccgo"))
- (apply (assoc-ref %standard-phases 'check) args)))))))
- (propagated-inputs
- (list go-github-com-davecgh-go-spew
- go-github-com-pmezard-go-difflib))
- (inputs
- (list go-github-com-stretchr-testify-bootstrap))
- (home-page "https://github.com/stretchr/objx")
- (synopsis "Go package for dealing with maps, slices, JSON and other data")
- (description "This package provides a Go library for dealing with maps,
-slices, JSON and other data.")
- (license license:expat)))
-
-(define go-github-com-stretchr-testify-bootstrap
- (package
- (inherit go-github-com-stretchr-testify)
- (arguments
- '(#:import-path "github.com/stretchr/testify"
- #:tests? #f
- #:phases (modify-phases %standard-phases
- (delete 'build))))
- (propagated-inputs
- (list go-gopkg-in-yaml-v3))))
-
(define-public go-github-com-technoweenie-multipartstreamer
(package
(name "go-github-com-technoweenie-multipartstreamer")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 66/66] gnu: actionlint: Update to 1.6.26.
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
58e69550a27bc7a2ad67ca5d5b2df611172ceb4f.1701297273.git.sharlatanus@gmail.com
* gnu/packages/check.scm (actionlint): Update to 1.6.26.
[inputs]: Swap go-github-com-robfig-cron-1.2 to go-github-com-robfig-cron

* gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): Delete variable.

Change-Id: Ie2c25254ffefb99f8808f74ae4a9d85bbbcb6437
---
gnu/packages/check.scm | 8 ++++----
gnu/packages/golang.scm | 18 ------------------
2 files changed, 4 insertions(+), 22 deletions(-)

Toggle diff (71 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1f5b886977..a2fdde903e 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
@@ -1069,7 +1069,7 @@ (define-public cpputest
(define-public actionlint
(package
(name "actionlint")
- (version "1.6.23")
+ (version "1.6.26")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1078,7 +1078,7 @@ (define-public actionlint
(file-name (git-file-name name version))
(sha256
(base32
- "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni"))))
+ "0j4ni2cryvqn3qim1r6q6sargh0wig6l4vjjwc40cgqvvkrdla04"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/rhysd/actionlint/cmd/actionlint"
@@ -1087,7 +1087,7 @@ (define-public actionlint
(inputs (list go-github-com-fatih-color
go-github-com-mattn-go-colorable
go-github-com-mattn-go-runewidth
- go-github-com-robfig-cron-1.2
+ go-github-com-robfig-cron
go-golang.org-x-sync-errgroup
go-golang.org-x-sync-semaphore
go-gopkg-in-yaml-v3))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 77a0d98c6e..2262f6011d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7277,24 +7277,6 @@ (define-public go-github-com-robfig-cron
a cron spec parser and job runner.")
(license license:expat)))
-;; Required by actionlint. The version of `go-github-com-robfig-cron'
-;; packaged in Guix is newer and changed some error messages, causing
-;; unit tests in actionlint to fail.
-(define-public go-github-com-robfig-cron-1.2
- (package
- (inherit go-github-com-robfig-cron)
- (name "go-github-com-robfig-cron")
- (version "1.2.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/robfig/cron")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva"))))))
-
(define-public go-github-com-shirou-gopsutil
(let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399")
(revision "0"))
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 62/66] gnu: go-github-com-google-go-github: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
7c282db3ec9cc208ca6e2674f03b6804a4a742dd.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-google-go-github): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (76 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index fbfa1049a4..20c3b0f3e1 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -538,6 +538,32 @@ (define-public go-github-com-goccy-go-json
(description "Fast JSON encoder/decoder compatible with encoding/json for Go.")
(license license:expat)))
+(define-public go-github-com-google-go-github
+ (package
+ (name "go-github-com-google-go-github")
+ (version "26.1.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/go-github")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:tests? #f ;application/octet-stream instead of text/plain
+ #:import-path "github.com/google/go-github/v26/github"
+ #:unpack-path "github.com/google/go-github/v26"))
+ (native-inputs
+ (list go-github-com-google-go-querystring go-golang-org-x-crypto))
+ (home-page "https://github.com/google/go-github/")
+ (synopsis "Client library for accessing the GitHub API v3")
+ (description "@code{go-github} is a Go client library for accessing the
+GitHub API v3.")
+ (license license:bsd-3)))
+
(define-public go-github-com-google-safehtml
(package
(name "go-github-com-google-safehtml")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1870eadb9c..b4bfe4986a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7810,32 +7810,6 @@ (define-public go-github-com-google-go-querystring
into URL query parameters.")
(license license:bsd-3))))
-(define-public go-github-com-google-go-github
- (package
- (name "go-github-com-google-go-github")
- (version "26.1.3")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/go-github")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi"))))
- (build-system go-build-system)
- (arguments
- `(#:tests? #f ;application/octet-stream instead of text/plain
- #:import-path "github.com/google/go-github/v26/github"
- #:unpack-path "github.com/google/go-github/v26"))
- (native-inputs
- (list go-github-com-google-go-querystring go-golang-org-x-crypto))
- (home-page "https://github.com/google/go-github/")
- (synopsis "Client library for accessing the GitHub API v3")
- (description "@code{go-github} is a Go client library for accessing the
-GitHub API v3.")
- (license license:bsd-3)))
-
(define-public go-github-com-google-renameio
(package
(name "go-github-com-google-renameio")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 63/66] gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
bc5ea1d279996dfd2209d58f4e27b8f072fc5dae.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-cloud-google-com-go-compute-metadata): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/mail.scm: Add (gnu packages golang-web) module.

Change-Id: Ic97e5f4afd26376d37860fbb4758e8037e758f58
---
gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++
gnu/packages/golang.scm | 27 ---------------------------
gnu/packages/mail.scm | 1 +
3 files changed, 28 insertions(+), 27 deletions(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 20c3b0f3e1..c046e0d46a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Adam Kandur <kefironpremise@gmail.com>
@@ -55,6 +56,32 @@ (define-module (gnu packages golang-web)
;;;
;;; Code:
+(define-public go-cloud-google-com-go-compute-metadata
+ (package
+ (name "go-cloud-google-com-go-compute-metadata")
+ (version "0.81.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/googleapis/google-cloud-go")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:unpack-path "cloud.google.com/go"
+ #:import-path "cloud.google.com/go/compute/metadata"))
+ (home-page
+ "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
+ (synopsis
+ "Go wrapper for Google Compute Engine metadata service")
+ (description
+ "This package provides access to Google Compute Engine (GCE) metadata and
+API service accounts for Go.")
+ (license license:asl2.0)))
+
(define-public go-github-com-andybalholm-cascadia
(package
(name "go-github-com-andybalholm-cascadia")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b4bfe4986a..7dcd2a00ac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4260,33 +4260,6 @@ (define-public go-github-com-blang-semver
(description "Semver is a library for Semantic versioning written in Go.")
(license license:expat))))
-(define-public go-cloud-google-com-go-compute-metadata
- (package
- (name "go-cloud-google-com-go-compute-metadata")
- (version "0.81.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/googleapis/google-cloud-go")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3"))))
- (build-system go-build-system)
- (arguments
- '(#:unpack-path "cloud.google.com/go"
- #:import-path "cloud.google.com/go/compute/metadata"))
- (home-page
- "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
- (synopsis
- "Go wrapper for Google Compute Engine metadata service")
- (description
- "This package provides access to Google Compute Engine (GCE) metadata and
-API service accounts for Go.")
- (license license:asl2.0)))
-
(define-public go-github-com-google-cadvisor
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
(revision "0"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 1676acf2f9..bb3fe1b3be 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-web)
#:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages gtk)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 64/66] gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
2dd75f0a000e6841edc61d4389d46f37a4c4636c.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-getsentry-raven-go): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

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

Toggle diff (96 lines)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index c046e0d46a..41c8c37a0b 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -45,6 +46,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 tls)
#:use-module (gnu packages web))
;;; Commentary:
@@ -521,6 +523,35 @@ (define-public go-github-com-francoispqt-gojay
(home-page "https://github.com/francoispqt/gojay")
(license license:expat)))
+;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is
+;; now read-only. The raven-go SDK is no longer maintained and was superseded
+;; by the sentry-go
+(define-public go-github-com-getsentry-raven-go
+ (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
+ (revision "0"))
+ (package
+ (name "go-github-com-getsentry-raven-go")
+ (version (git-version "0.2.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/getsentry/raven-go")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/getsentry/raven-go"))
+ (propagated-inputs
+ (list go-github-com-certifi-gocertifi go-github-com-pkg-errors))
+ (home-page "https://github.com/getsentry/raven-go")
+ (synopsis "Sentry client in Go")
+ (description "This package is a Go client API for the Sentry event/error
+logging system.")
+ (license license:bsd-3))))
+
(define-public go-github-com-go-chi-chi-v5
(package
(name "go-github-com-go-chi-chi-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7dcd2a00ac..2f3bdf5993 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4038,33 +4038,6 @@ (define-public go-github-com-burntsushi-toml
is similar to Go's standard library @code{json} and @code{xml} package.")
(license license:expat)))
-(define-public go-github-com-getsentry-raven-go
- (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92")
- (revision "0"))
- (package
- (name "go-github-com-getsentry-raven-go")
- (version (git-version "0.2.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/getsentry/raven-go")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/getsentry/raven-go"))
- (propagated-inputs
- (list go-github-com-certifi-gocertifi go-github-com-pkg-errors))
- (home-page "https://github.com/getsentry/raven-go")
- (synopsis "Sentry client in Go")
- (description "This package is a Go client API for the Sentry event/error
-logging system.")
- (license license:bsd-3))))
-
(define-public go-github-com-hashicorp-go-uuid
(package
(name "go-github-com-hashicorp-go-uuid")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 29 Nov 2023 23:35
[PATCH v3 65/66] gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web).
(address . 66827@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
54af8edd980432a56f73af5e62765a703342454a.1701297273.git.sharlatanus@gmail.com
* gnu/packages/golang.scm (go-github-com-go-telegram-bot-api-telegram-bot-api): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

Change-Id: Ia631773394faaff150c18b074c943565f6998e1f
---
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 41c8c37a0b..7759916c35 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -575,6 +575,31 @@ (define-public go-github-com-go-chi-chi-v5
decompose request handling into many smaller layers.")
(license license:expat)))
+(define-public go-github-com-go-telegram-bot-api-telegram-bot-api
+ (package
+ (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
+ (version "4.6.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
+ (build-system go-build-system)
+ (home-page "https://go-telegram-bot-api.dev/")
+ (arguments
+ (list #:tests? #f ; Upstream tests are broken.
+ #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
+ (propagated-inputs
+ (list go-github-com-technoweenie-multipartstreamer))
+ (synopsis "Golang bindings for the Telegram Bot API")
+ (description
+ "This package provides Golang bindings for the Telegram Bot API.")
+ (license license:expat)))
+
(define-public go-github-com-goccy-go-json
(package
(name "go-github-com-goccy-go-json")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2f3bdf5993..77a0d98c6e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10048,31 +10048,6 @@ (define-public go-github-com-tekwizely-go-parsing
parsers, and related tools.")
(license license:expat))))
-(define-public go-github-com-go-telegram-bot-api-telegram-bot-api
- (package
- (name "go-github-com-go-telegram-bot-api-telegram-bot-api")
- (version "4.6.4")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/go-telegram-bot-api/telegram-bot-api")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w"))))
- (build-system go-build-system)
- (home-page "https://go-telegram-bot-api.dev/")
- (arguments
- (list #:tests? #f ; Upstream tests are broken.
- #:import-path "github.com/go-telegram-bot-api/telegram-bot-api"))
- (propagated-inputs
- (list go-github-com-technoweenie-multipartstreamer))
- (synopsis "Golang bindings for the Telegram Bot API")
- (description
- "This package provides Golang bindings for the Telegram Bot API.")
- (license license:expat)))
-
(define-public go-github.com-ulikunitz-xz
(package
(name "go-github.com-ulikunitz-xz")
--
2.41.0
M
M
Maxim Cournoyer wrote on 3 Jan 22:44 +0100
Re: none
(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
87sf3e3xd7.fsf@gmail.com
Hi,

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

Toggle quote (8 lines)
> Hi,
>
> Gentle ping here and I might need some encouragement to grasp status
> "pending" .
> It lists some build failures and lint warnings which were present
> previously. I may submit adjustment in separate issue when this one is
> merged.

I've now merged it, sorry for the delay!

Thank you for this excellent work!

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

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

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