sharlatan pushed a commit to branch go-team
in repository guix.
commit b874bf0a6b0ef0142898d6cd4b679aba18d8396a
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Sat Feb 22 09:50:33 2025 +0000
gnu: lyrebird: Move to golang-web.
* gnu/packages/golang.scm (lyrebird): Move from here ...
* gnu/packages/golang-web.scm: ... to here.
* gnu/packages/tor-browsers.scm: Add (gnu packages golang-web).
Change-Id: I26ecdbf2b40008c4c453fcf91423cabf9e90cf87
---
gnu/packages/golang-web.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
gnu/packages/golang.scm | 42 ------------------------------------------
gnu/packages/tor-browsers.scm | 1 +
3 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ec6f75f1a7..0a00787b16 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -10158,6 +10158,49 @@ protocol.")
;;; Executables:
;;;
+(define-public lyrebird
+ (package
+ (name "lyrebird")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird";)
+ (commit (string-append "lyrebird-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1qk7npkj0a3a28rp38whl1jwjr0z0hdcsq5bgm8bl1fk9g6cqbnp"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:unpack-path
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird"
+ #:import-path
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird"))
+ (propagated-inputs
+ (list go-filippo-io-edwards25519
+ go-github-com-dchest-siphash
+ go-github-com-refraction-networking-utls
+ go-gitlab-com-yawning-edwards25519-extra
+
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib
+
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-snowflake-v2
+
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel
+ go-golang-org-x-crypto
+ go-golang-org-x-net))
+ (home-page
"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird";)
+ (synopsis "Look-like nothing obfuscation protocol")
+ (description
+ "This is a look-like nothing obfuscation protocol that incorporates ideas
+and concepts from Philipp Winter's ScrambleSuit protocol.")
+ (license (list license:bsd-2 license:bsd-3))))
+
+(define-public
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
+ ;; This is a final command, no need for a full name of the go.mod module path
+ ;; style. The same is suggested in project's README and Makefile.
+ (deprecated-package
+ "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird"
+ lyrebird))
+
(define-public go-jose-util
(package
(name "go-jose-util")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4be9db790a..ed8f148792 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1087,48 +1087,6 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(define-public go-std-1.22 (make-go-std go-1.22))
(define-public go-std-1.23 (make-go-std go-1.23))
-(define-public lyrebird
- (package
- (name "lyrebird")
- (version "0.5.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url
"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird";)
- (commit (string-append "lyrebird-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1qk7npkj0a3a28rp38whl1jwjr0z0hdcsq5bgm8bl1fk9g6cqbnp"))))
- (build-system go-build-system)
- (arguments
- (list
- #:install-source? #f
- #:unpack-path
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird"
- #:import-path
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird"))
- (propagated-inputs
- (list go-filippo-io-edwards25519
- go-github-com-dchest-siphash
- go-github-com-refraction-networking-utls
- go-gitlab-com-yawning-edwards25519-extra
-
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib
-
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-snowflake-v2
-
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel
- go-golang-org-x-crypto
- go-golang-org-x-net))
- (home-page
"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird";)
- (synopsis "Look-like nothing obfuscation protocol")
- (description "This is a look-like nothing obfuscation protocol that
-incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol.")
- (license (list license:bsd-2 license:bsd-3))))
-
-(define-public
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
- ;; This is a final command, no need for a full name of the go.mod module path
- ;; style. The same is suggested in project's README and Makefile.
- (deprecated-package
- "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird"
- lyrebird))
-
(define-public go-github-com-aarzilli-golua
(let ((commit "03fc4642d792b1f2bc5e7343b403cf490f8c501d")
(revision "0"))
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 62f64baeee..01dbfcc1a8 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -52,6 +52,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-web)
#:use-module (gnu packages gtk)
#:use-module (gnu packages hunspell)
#:use-module (gnu packages icu4c)
