From 849f219b72b5638b6abaf7d143654976ad99042e Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Thu, 12 Aug 2021 21:37:00 -0700 Subject: [PATCH] gnu: go-torproject-org-pluggable-transports-goptlib: Fix import path. * gnu/packages/golang.scm (go-torproject-org-pluggable-transports-goptlib) [arguments] <#:import-path>: Use actual module name from go.mod. (go-github-com-operatorfoundation-shapeshifter-transports) [arguments] <#:phases>: Remove obsolete 'patch phase for goptlib. (go-github-com-operatorfoundation-obfs4) [arguments] <#:phases>: Likewise. Signed-off-by: Sharlatan Hellseher Change-Id: Ib2e49164e2c750694101b497afe1be67c7fe6302 --- gnu/packages/golang.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a8f55df9153c6059d1a24cc2ee3438e583c4e895..15904a427301e80ead557e6cee07c13e60c72ead 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1288,11 +1288,6 @@ retry strategies, such as fixed delay, backoff delay, and random delay.") `(#:unpack-path "github.com/OperatorFoundation/shapeshifter-transports" #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* (find-files "." "\\.go$") - ;; To drop '.git' suffix in import path of goptlib. - (("goptlib\\.git") "goptlib")))) (replace 'build (lambda arguments (for-each @@ -2124,11 +2119,6 @@ protocol from the Pluggable Transports 2.0 specification.") `(#:unpack-path "github.com/OperatorFoundation/obfs4" #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* (find-files "." "\\.go$") - ;; To drop '.git' suffix in import path of goptlib. - (("goptlib\\.git") "goptlib")))) (replace 'build (lambda arguments (for-each @@ -2397,7 +2387,7 @@ translated keywords and acts.") (base32 "1lh938194hvkf8pqgnxwf6hvjv9rv0j3kasi07r2ckrj8sxzk4jc")))) (build-system go-build-system) (arguments - `(#:import-path "git.torproject.org/pluggable-transports/goptlib")) + `(#:import-path "git.torproject.org/pluggable-transports/goptlib.git")) (home-page "https://gitweb.torproject.org/pluggable-transports/goptlib.git/") (synopsis "Go pluggable transports library") (description "GoPtLib is a library for writing Tor pluggable transports in