sharlatan pushed a commit to branch go-team
in repository guix.
commit ec755acbc8d79a1bb094037cf3a3352b06b118ec
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Sat Jan 11 23:13:43 2025 +0000
gnu: Deprecate
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird.
* gnu/packages/golang.scm
(go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird):
Deprecate variable.
(lyrebird): New variable.
* gnu/packages/tor-browsers.scm (torbrowser) [inputs]: Remove
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird,
add lyrebird.
(mullvadbrowser): Adjust "modify-inputs" accordingly.
Change-Id: I8aa67148a08baafcd0dfe3a0ceac43c5939139e9
---
gnu/packages/golang.scm | 5 +++--
gnu/packages/tor-browsers.scm | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6702dfeb5a..79e522fde4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1627,9 +1627,9 @@ standard Fountain, but also has some custom syntax
extensions such as
translated keywords and acts.")
(license license:gpl3)))
-(define-public
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
+(define-public lyrebird
(package
- (name
"go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird")
+ (name "lyrebird")
(version "0.5.0")
(source (origin
(method git-fetch)
@@ -1643,6 +1643,7 @@ translated keywords and acts.")
(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
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 32294e2bad..fa28e9611f 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -216,7 +216,7 @@ Browser.")
"1nnsmz6v8xnp67ih0jgail27c4cg6zfdax8qkd6hcn8i7pscgc72"))))
(build-system mozilla-build-system)
(inputs
- (list
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
+ (list lyrebird
firefox-locales
tor-client
alsa-lib
@@ -956,7 +956,7 @@ Mullvad Browser.")
(delete 'autoconfig-tor)))))
(inputs
(modify-inputs (package-inputs torbrowser)
- (delete
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird)))
+ (delete lyrebird)))
(propagated-inputs
(modify-inputs (package-propagated-inputs torbrowser)
(append ublock-origin/icecat)))
