From d14389f10ec8c7e4c0a91c1c5094befc4445ddf0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:39 +0000 Subject: gnu: Add (gnu packages golang-web) module. * gnu/packages/golang-web.scm: New file. * gnu/local.mk: Add to gnu/packages/golang-web.scm scope. --- gnu/packages/golang-web.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 gnu/packages/golang-web.scm (limited to 'gnu/packages/golang-web.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 . + +(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. +;;; -- cgit v1.2.3 From a0006c4dc5354c703c74b7561a3e7866297e95dd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:40 +0000 Subject: gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 98a220385b..749f741710 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 +;;; Copyright © 2020 Martin Becze ;;; ;;; 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 fb77f610e7..edc8c2bec0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4862,30 +4862,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 f61c4f045c..13ae53aa8c 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) -- cgit v1.2.3 From d17d7e6ca1b4517162049dfa7f163b0ab0f737fd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:41 +0000 Subject: gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; 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 edc8c2bec0..74b5df2fb8 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) @@ -4816,28 +4817,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")) -- cgit v1.2.3 From 213a54e8de6f534a01420335411bd9cfb3220795 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:42 +0000 Subject: gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 74b5df2fb8..5c397ea81a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9541,31 +9541,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") -- cgit v1.2.3 From 1bc5e65aadb9677313a9b30b0bb67208694710c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:43 +0000 Subject: gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2022 Giacomo Leidi ;;; ;;; 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 5c397ea81a..5b78ed8576 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9466,30 +9466,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") -- cgit v1.2.3 From 5dbb2511e77390a65249a7efe9c4badf0ed95d66 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:44 +0000 Subject: gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi ;;; ;;; 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 5b78ed8576..729d50f600 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9466,30 +9466,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") -- cgit v1.2.3 From 7b2c29095672dd330b17ccabc01128a7e4f45924 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:45 +0000 Subject: gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi ;;; @@ -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 729d50f600..52168b93cb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9493,34 +9493,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") -- cgit v1.2.3 From 13ab4abe98f1a88256d4ecd9b3ee3cb026515f4e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:46 +0000 Subject: gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi +;;; Copyright © 2022 muradm ;;; ;;; 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 52168b93cb..9fe55bc551 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12909,27 +12909,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)) -- cgit v1.2.3 From e0060729b5dfa678bd686ad20435485a73f3d4d0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:47 +0000 Subject: gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1ca534aa00..564927c2a7 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 9fe55bc551..f51d8fd455 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12909,32 +12909,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") -- cgit v1.2.3 From fae3b9d5988393e5385c5d3d067b1412fd1044a2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:48 +0000 Subject: gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 58c071e1fa..3126464347 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 ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm ;;; @@ -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 f51d8fd455..fb826c2743 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,32 +4867,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") -- cgit v1.2.3 From 170d43cd0d954f09480ed71b29a981ac2a179065 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:49 +0000 Subject: gnu: go-github-com-gorilla-handlers: Remove input labels. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 -- cgit v1.2.3 From 2a0b7df5b4b9e7b27a79e7ecc646113af97808b1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:50 +0000 Subject: gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 fb826c2743..841b507cda 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5145,31 +5145,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") -- cgit v1.2.3 From 1754f847aa854d004348a6d1090b0132ad87055a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:51 +0000 Subject: gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 841b507cda..53ae15e2e2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,31 +4867,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") -- cgit v1.2.3 From b870f17a83f9a17e0f4677cf0f8303d120106328 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:52 +0000 Subject: gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Nicolas Graves ;;; ;;; 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 53ae15e2e2..14b6fef71d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,31 +4867,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") -- cgit v1.2.3 From ddb3448cf071ae6b9f6efecb413716a5da848669 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:53 +0000 Subject: gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 14b6fef71d..421a1e1181 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1573,54 +1573,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") -- cgit v1.2.3 From 88b168ed27e48b2a45b0f27d2bfa0a6870d52a47 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:54 +0000 Subject: gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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") -- cgit v1.2.3 From 15593105894af86d86e627d136e5a3c5a791d2ea Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:55 +0000 Subject: gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 421a1e1181..44eb9122b9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1499,33 +1499,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") -- cgit v1.2.3 From db6f2a0f8aa03110ae6d6179610f3e277110f1ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:56 +0000 Subject: gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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") -- cgit v1.2.3 From c058e08d8b9cb6880c7485615e92623dc349fb33 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:57 +0000 Subject: gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 44eb9122b9..6cccf2098a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1499,30 +1499,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") -- cgit v1.2.3 From f1fab4912270bcc81890d7e9d8f55ce54915be1d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:58 +0000 Subject: gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 -- cgit v1.2.3 From 80f52867abde1ba7ed4831fe5d489c9cd0be862f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:59 +0000 Subject: gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 6cccf2098a..e0c5ef31af 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4768,33 +4768,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")) -- cgit v1.2.3 From fd51ae6a374cb2f151884dc27de2ff11141f5f5c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:00 +0000 Subject: gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Nicolas Graves ;;; ;;; 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 e0c5ef31af..74bd542d42 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3573,46 +3573,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") -- cgit v1.2.3 From b184a16c141d110840b023851b233dfe032a2f72 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:01 +0000 Subject: gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 74bd542d42..acffd91dde 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3573,43 +3573,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") -- cgit v1.2.3 From 032cac46ed01ceb628a08bdbcc97b256a71002ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:02 +0000 Subject: gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 acffd91dde..52d65d4967 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4641,30 +4641,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") -- cgit v1.2.3 From d0dc31a56ec497e070eb6662c8ff6b4b3e5c7cef Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:03 +0000 Subject: gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 52d65d4967..292d4f799d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9165,30 +9165,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") -- cgit v1.2.3 From 815821c139798e42e2c022a5c2128ea10e9d2fea Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:04 +0000 Subject: gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves ;;; ;;; 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 292d4f799d..84dead6293 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12510,31 +12510,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") -- cgit v1.2.3 From a3a25490ec6d7da6f8da2bc374e28d11ccc3a4d8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:05 +0000 Subject: gnu: go-github-com-google-safehtml: Remove input labels. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 -- cgit v1.2.3 From 8a8b218b3fa963e078d63b38774539ee1cf9ae15 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:06 +0000 Subject: gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi @@ -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 84dead6293..a49df748f7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10508,64 +10508,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") -- cgit v1.2.3 From 584bff22f27436c095a56560865cae05b31fbd84 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:07 +0000 Subject: gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 a49df748f7..f222b40ead 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3359,35 +3359,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) -- cgit v1.2.3 From 66ea5eebb192dd144d44b0520166e9b095f8ac8b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:08 +0000 Subject: gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 f222b40ead..f67b38f34e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9379,33 +9379,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) -- cgit v1.2.3 From cb523a9b6bce0332c796d4a2033d7d60a712a58b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:09 +0000 Subject: gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 f67b38f34e..aa158f5620 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9379,28 +9379,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") -- cgit v1.2.3 From 157369092adae975e2cd5f8f6e68f234e685900f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:10 +0000 Subject: gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 aa158f5620..1a02f66ac8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3331,34 +3331,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) -- cgit v1.2.3 From 61b29e1cf2a2093ae5f4a14685bdc993552ff041 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:11 +0000 Subject: gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; 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 1a02f66ac8..e79179679c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11304,46 +11304,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") -- cgit v1.2.3 From 9b7806717f4ab244ba0cc4ec23dd4a841cbd910b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:12 +0000 Subject: gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Martin Becze -;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi +;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves -;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; 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 e79179679c..b66e49801c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12117,29 +12117,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") -- cgit v1.2.3 From 0ca7181c80d8d8d2ddd9741dd30fb19f87a2266f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:13 +0000 Subject: gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi -;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm +;;; Copyright © 2022, 2023 Sharlatan Hellseher ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves @@ -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 b66e49801c..fad77f7a27 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9601,29 +9601,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) -- cgit v1.2.3 From 9a5946bc7aa56f541c374832c2e2ef08c25d19b9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:14 +0000 Subject: gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 +;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior @@ -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 fad77f7a27..e3c4577a57 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4507,30 +4507,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") -- cgit v1.2.3 From 75641bbd7398c8344450d54eeba035c0bbebdcaa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:15 +0000 Subject: gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen @@ -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 e3c4577a57..be31cd0f43 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4459,30 +4459,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")) -- cgit v1.2.3 From 7a9f0869d4677b553083f6439b673b95beae766c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:16 +0000 Subject: gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi @@ -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 be31cd0f43..40ffc1143d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1934,30 +1934,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") -- cgit v1.2.3 From d087261febf44b44936548849f155bc57680dadb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:17 +0000 Subject: gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen -;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm @@ -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 40ffc1143d..beb14e0c3f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7479,31 +7479,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") -- cgit v1.2.3 From 502c8a7442e20c8d9aced661db4a4f8f7551ea44 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:18 +0000 Subject: gnu: go-github-com-francoispqt-gojay: Adjust inputs. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 -- cgit v1.2.3 From 8e3a60728ab21f60bbc1fbcfacffede5f2aad92e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:19 +0000 Subject: gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Adam Kandur ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm @@ -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 beb14e0c3f..f601d315af 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4174,28 +4174,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")) -- cgit v1.2.3 From a8378baeb088cc41dc7bb0230b95e8cffbd544fa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:20 +0000 Subject: gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 f601d315af..6add5de065 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8962,33 +8962,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") -- cgit v1.2.3 From 59be3604e3eaae399428ee11043964de0cbdf06a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:21 +0000 Subject: gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 6add5de065..f2066618f2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,30 +11436,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") -- cgit v1.2.3 From a171f12286a96613999c2fe67c65b2c342e545fb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:22 +0000 Subject: gnu: go-github-com-aws-smithy-go: Adjust description. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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))) -- cgit v1.2.3 From ae1d9ed08f9c45dd07b4429aebcb3cbd7b90116e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:23 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 f2066618f2..2ccbcae7bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,31 +11436,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 d561fb32e3..40d7a00dae 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -107,6 +107,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) -- cgit v1.2.3 From 31af3c2e3703202803927543a4473d4c0f56e6fc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:24 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020-2022 Efraim Flashner +;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Adam Kandur @@ -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 2ccbcae7bf..e32b0f538b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11686,31 +11686,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") -- cgit v1.2.3 From d9246c6b8961cc4fc99cd991a511046bcc212912 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:25 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 e32b0f538b..cc205a39bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,17 +11436,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) -- cgit v1.2.3 From 8f22dbde7ea3bf5f4bf83736dd3dd9192269da1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:26 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 cc205a39bf..d74331ad53 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,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) -- cgit v1.2.3 From d6285224ad7b0baff6b76bb0061ebab7171babdc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:27 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 d74331ad53..8cdf80712d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,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) -- cgit v1.2.3 From 24d16888ab6b4af3436d0bf882b2ffbe0e4551f1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:28 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 8cdf80712d..8869e3317d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,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) -- cgit v1.2.3 From b344dc44beca7818be87d87aa0bbf0097df90048 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:29 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 8869e3317d..6331f0d2c7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,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) -- cgit v1.2.3 From 04bb3c7af6ccb656486e738a87bdc49b0e0eb246 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:30 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 6331f0d2c7..7350d2ccc5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,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) -- cgit v1.2.3 From d0f3a60169ebb2505653afd588aea33ab02e8ca5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:31 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 7350d2ccc5..bcc10946b1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,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") -- cgit v1.2.3 From ba8babd9e74ab5692cfccc32f7dbafe9506a5002 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:32 +0000 Subject: gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov @@ -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 bcc10946b1..9fbe2d5b97 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9049,33 +9049,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") -- cgit v1.2.3 From ab7511ad0d29c74e464087e67081cc87836a9c09 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:33 +0000 Subject: gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan @@ -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 9fbe2d5b97..5505a6c071 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10228,30 +10228,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 dad217beb0..c3796f7328 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) -- cgit v1.2.3 From 65b1156d2b92bebacef1792615c85140c5ce41a3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:34 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 5505a6c071..819d0b81b7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12439,46 +12439,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") -- cgit v1.2.3 From 1371b119f3678e592c6aa03648df8bcd902dfeed Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:35 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs. * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 -- cgit v1.2.3 From 3a3484bf5dd485b0a8ade2deb68368477eabca9c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:36 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 819d0b81b7..31e7871e80 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12388,31 +12388,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")) -- cgit v1.2.3 From a249278269e59c955d1a43dd3dce648f56fa7270 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:37 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 31e7871e80..17d08a1f40 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12388,32 +12388,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") -- cgit v1.2.3 From 236ae7820e8ee6071975ee880a586a36751ecf13 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:38 +0000 Subject: gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 17d08a1f40..add75b11d2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6671,32 +6671,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")) -- cgit v1.2.3 From bd0898a9cce91e9db742800b98cde15d722510d3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:40 +0000 Subject: gnu: go-github-com-google-go-github: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 add75b11d2..0d83c2b270 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7987,32 +7987,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") -- cgit v1.2.3 From 972c1245c6e7595bd26a2ca279c750d2ccd76e1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:41 +0000 Subject: gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering +;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Adam Kandur @@ -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 0d83c2b270..0fbc031c67 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4437,33 +4437,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 523c20c4a9..4466e5e6d9 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) -- cgit v1.2.3 From ea94cb36d6568491a75dbd783dd1bb691821b8a5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:42 +0000 Subject: gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering +;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen @@ -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 0fbc031c67..dcf7fcc2a8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4174,33 +4174,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") -- cgit v1.2.3 From d041bf2bb058bceab3832b464aa49aa6c1c5d861 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:43 +0000 Subject: gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web). * 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(-) (limited to 'gnu/packages/golang-web.scm') 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 dcf7fcc2a8..4ee41f671d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10236,31 +10236,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") -- cgit v1.2.3 From 837e5f737e263f7f0da8bef84ec347e209839f1e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Jan 2024 03:03:30 +0000 Subject: gnu: go-github-com-hjson-hjson-go: Fix commit. This package was updated in ada2152893eda2301890e6a438c3e9fb4e0f190d and moved with lower version which broke yggdrasil. Author: Artyom V. Poptsov AuthorDate: Wed Nov 1 00:15:16 2023 +0300 Commit: Christopher Baines CommitDate: Fri Nov 3 10:14:06 2023 +0000 gnu: go-github-com-hjson-hjson-go: Update to 4.3.1. * gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Update to 4.3.1. Change-Id: Iee2aef614686cbf79f388e2dd9435745d5502e2a Signed-off-by: Andrew Tropin --- gnu/packages/golang-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang-web.scm') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7759916c35..3e60bfaf33 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -870,7 +871,7 @@ (define-public go-github-com-gorilla-websocket (define-public go-github-com-hjson-hjson-go (package (name "go-github-com-hjson-hjson-go") - (version "3.1.0") + (version "4.3.1") (source (origin (method git-fetch) @@ -879,7 +880,7 @@ (define-public go-github-com-hjson-hjson-go (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz")))) + (base32 "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) (build-system go-build-system) (arguments '(#:import-path "github.com/hjson/hjson-go")) -- cgit v1.2.3