From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +KaiJzX3FWEKyQAAgWs5BA (envelope-from ) for ; Fri, 13 Aug 2021 06:38:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0MNcIzX3FWEkWwAA1q6Kng (envelope-from ) for ; Fri, 13 Aug 2021 04:38:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 769F82C521 for ; Fri, 13 Aug 2021 06:38:12 +0200 (CEST) Received: from localhost ([::1]:33478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEOxN-0007Gu-Ix for larch@yhetil.org; Fri, 13 Aug 2021 00:38:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEOxG-0007Gf-Jj for guix-patches@gnu.org; Fri, 13 Aug 2021 00:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEOxG-00021j-4C for guix-patches@gnu.org; Fri, 13 Aug 2021 00:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mEOxF-0003xW-VZ for guix-patches@gnu.org; Fri, 13 Aug 2021 00:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49989] [PATCH v2] gnu: go-torproject-org-pluggable-transports-goptlib: Fix import path. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Aug 2021 04:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49989@debbugs.gnu.org Received: via spool by 49989-submit@debbugs.gnu.org id=B49989.162882943515156 (code B ref 49989); Fri, 13 Aug 2021 04:38:01 +0000 Received: (at 49989) by debbugs.gnu.org; 13 Aug 2021 04:37:15 +0000 Received: from localhost ([127.0.0.1]:40236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEOwR-0003wI-FA for submit@debbugs.gnu.org; Fri, 13 Aug 2021 00:37:15 -0400 Received: from out2.migadu.com ([188.165.223.204]:16404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEOwK-0003w2-AE for 49989@debbugs.gnu.org; Fri, 13 Aug 2021 00:37:09 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628829421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8dBbU/e6KC4Jf3OVYMbsiHTSulHK8F1xmro5ZHEm1ZI=; b=dV+2IsoxQh2ZIP/Bjb6JiZEY7uAgh3cSM9SmY5D2bMoyoBkgpv81lV76CW6e+zSrQbaka8 zrZs/bCB5XJqxqMGEA8vnG4jwV9QcmRrYCo56eojNOBzOODnJRXrJp3MQkuHR31qymV56c IjW01A8rrLPzUgNmiM9xEixPIeFpbs8= From: Sarah Morgensen Date: Thu, 12 Aug 2021 21:37:00 -0700 Message-Id: In-Reply-To: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> References: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628829493; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=8dBbU/e6KC4Jf3OVYMbsiHTSulHK8F1xmro5ZHEm1ZI=; b=EFRqqqlBrbMQLUxIog8zsOsy/xXpgl6mEbBhPZr86mTxSyVAIsE/dNnzeBFYT9R7hoMDVf stCki2XH6aO3xQTKLon1xC/v2qFJzBEA/moet0/Kmqw0BnZOMhtbFtZbKJ4lxlN/Bp8bhg vSKBtN58wS3nsElbpPvedqzyB/hgQ4lWjFoyQZMKrkQ77zGXLI77FJTUfsWHIFHLlwXA// PKLdS7SZ2TEgx1s3EXq5SdSxFkYCuATYG6JeXigo5gwNr9R4bvv2Ndij//v9fiYrbk6JrZ ylo5wd1jXAaXHZ5ERAIuvLzjWFOilOifKc2IPXIYxsaRfi1vebA2G/PAC7yEGw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628829493; a=rsa-sha256; cv=none; b=rmNXwOCAicMosNWJuy++lSkgyX4iiZkf+keW6mJEx4uBwKXBZ1kKK5n+gqt5J/jvFdwrLA Abg/YBBFuHyNB0wTqYc7/v4KcCTvDytC5TYuMaaKq/hYKILlVjabzaplsQxQmjZJaSEm1p gnueGgnILZ0+WACK4+2PaaDSTcKj/cD9Ko/cLCV/i2EsfRqYhfnnkXiSeXNV4gEOAevAq7 HvpmuBpcbsGiIDEEo2etl86aO7Iz03W2LqorvfJx8pk+OBEyxP9uV1FFD+v+W769pi2LSa TDIfcDqDTAzVJmI0R/A782Wd/vatDhPM2uPFSN3p8DXXeBtkUiRIxTbgAJj/Pw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=dV+2Isox; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=dV+2Isox; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 769F82C521 X-Spam-Score: 3.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: VDFohY9qMIsA * 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