GNU bug report logs - #49989
[PATCH 1/3] gnu: go-torproject-org-pluggable-transports-goptlib: Fix import path.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49989 in the body.
You can then email your comments to 49989 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: guix-patches <at> gnu.org
Subject: [PATCH 1/3] gnu: go-torproject-org-pluggable-transports-goptlib: Fix
 import path.
Date: Tue, 10 Aug 2021 14:07:58 -0700

* gnu/packages/golang.scm (go-torproject-org-pluggable-transports-goptlib)
[arguments]<#:import-path>: Use actual module name from go.mod.
---
Hello Guix,

Just a little fix for this import path, so dependents don't have to patch its
name.

Tested to build on x86_64, which since this is just a change in import path
name, should have caught any issues.

--
Sarah
 gnu/packages/golang.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 15f3ea46c4..ca029345e2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -822,7 +822,7 @@ parsing and encoding support for STUN and TURN protocols.")
         (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

base-commit: c8e2be3b32fe784a9db52d8a1a12902ab12ae7cb
-- 
2.31.1

Message #8 received at 49989 <at> debbugs.gnu.org (full text, mbox):

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: 49989 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu:
 go-github-com-operatorfoundation-shapeshifter-transports: Remove goptlib
 patch.
Date: Tue, 10 Aug 2021 14:10:02 -0700

* gnu/packages/golang.scm (go-github-com-operatorfoundation-shapeshifter-transports)
[arguments]<#:phases>: Remove obsolete 'patch' phase for goptlib.
---
 gnu/packages/golang.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ca029345e2..166f578ee8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -127,11 +127,6 @@ filtering devices.")
      `(#: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
-- 
2.31.1

Message #11 received at 49989 <at> debbugs.gnu.org (full text, mbox):

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: 49989 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: go-github-com-operatorfoundation-obfs4: Remove
 goptlib patch.
Date: Tue, 10 Aug 2021 14:10:03 -0700

* gnu/packages/golang.scm (go-github-com-operatorfoundation-obfs4)
[arguments]<#:phases>: Remove obsolete 'patch' phase for goptlib.
---
 gnu/packages/golang.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 166f578ee8..9d49a3130e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -666,11 +666,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
-- 
2.31.1

Message #14 received at 49989 <at> debbugs.gnu.org (full text, mbox):

From: Sarah Morgensen <iskarian <at> mgsn.dev>
To: 49989 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: go-torproject-org-pluggable-transports-goptlib: Fix
 import path.
Date: Thu, 12 Aug 2021 21:37:00 -0700

* 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.
---
Since it will break builds if these are applied separately, I went ahead and
merged these into one commit.

 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 f4cd30c662..20c8a519dc 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -661,11 +661,6 @@ filtering devices.")
      `(#: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
@@ -1205,11 +1200,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
@@ -1356,7 +1346,7 @@ parsing and encoding support for STUN and TURN protocols.")
         (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

base-commit: d87d6d68128c53a95fe09c3a4381575646c0f368
-- 
2.31.1

Message #19 received at 49989-done <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 49989-done <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: go-torproject-org-pluggable-transports-goptlib:
 Fix import path.
Date: Wed, 31 Jan 2024 20:23:44 +0000

[Message part 1 (text/plain, inline)]

Hi,

Pushed v2 as 849f219b72b5638b6abaf7d143654976ad99042e to master.

Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.