From patchwork Tue Nov 29 23:39:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: EuAndreh X-Patchwork-Id: 44972 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 627D827BBEC; Tue, 29 Nov 2022 23:41:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2906327BBE9 for ; Tue, 29 Nov 2022 23:41:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0ADp-0002YS-3t; Tue, 29 Nov 2022 18:41:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0ADn-0002Xl-Fi for guix-patches@gnu.org; Tue, 29 Nov 2022 18:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p0ADn-0001IC-6X for guix-patches@gnu.org; Tue, 29 Nov 2022 18:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p0ADm-0004gq-Qy for guix-patches@gnu.org; Tue, 29 Nov 2022 18:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59704] [PATCH 1/1] services: wireguard: Use the parameterized wireguard package. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 23:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59704@debbugs.gnu.org Cc: EuAndreh X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166976521318010 (code B ref -1); Tue, 29 Nov 2022 23:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Nov 2022 23:40:13 +0000 Received: from localhost ([127.0.0.1]:57188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ACz-0004gQ-EG for submit@debbugs.gnu.org; Tue, 29 Nov 2022 18:40:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:39874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0ACv-0004gI-Je for submit@debbugs.gnu.org; Tue, 29 Nov 2022 18:40:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0ACv-0002Gw-76 for guix-patches@gnu.org; Tue, 29 Nov 2022 18:40:09 -0500 Received: from euandre.org ([2001:19f0:b400:1f0c:5400:4ff:fe35:8c89]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0ACY-0000oI-C4 for guix-patches@gnu.org; Tue, 29 Nov 2022 18:40:05 -0500 Received: from euandre.org (localhost [127.0.0.1]) by euandre.org (Postfix) with ESMTP id AF9E93794BD; Tue, 29 Nov 2022 20:39:34 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=euandre.org; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=dkimproxy; bh=b5gTHooN63L7hVA01IOD 0rVQX1o=; b=NyTHecVsqn19/CVEU5lVRiFrr+eKMJBluorRjU43bsMAKppfRbSh IteF+k/nJCPunTktAbmXuNWNsl2Gs2rjI8GyzxLzJkOrV9cm/qQzWj09tyUzTsgi dC2kVy1mZczVUJGzGbz4XSpCiWGmlUS+e9OwXrLvWzzjtlwE+COyzkz4I6+dWpp0 cYcRaR4QJBREWXmVdE4rofmlBOw+v5K21Rd4+mlcXPP2tmIr8iXO4MERNyFj0I4g tBTPuRfG/NIMcrnIV7IA3c5qsbqvF5Nn57hspQU4zeaO43k7vSYhZcSBvPlZy4/S jFBI+a6aqYWz5ASE+suRF59qH3yDqwme/Q== Date: Tue, 29 Nov 2022 20:39:29 -0300 Message-Id: <20221129233929.28696-1-eu@euandre.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:19f0:b400:1f0c:5400:4ff:fe35:8c89; envelope-from=eu@euandre.org; helo=euandre.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: EuAndreh X-ACL-Warn: , EuAndreh via Guix-patches X-Patchwork-Original-From: EuAndreh via Guix-patches via From: EuAndreh Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/vpn.scm (wireguard-activation): Use the "wg" binary from the package given to . --- Notes: As of now, there is no other reference to the global "wireguard-tools" package in the gnu/services/vpn.scm file. gnu/services/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index def381987b..7b3bb8903c 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -833,7 +833,7 @@ (define (peer->config peer) (define (wireguard-activation config) (match-record config - (private-key) + (private-key wireguard) #~(begin (use-modules (guix build utils) (ice-9 popen) @@ -842,7 +842,7 @@ (define (wireguard-activation config) (unless (file-exists? #$private-key) (let* ((pipe (open-input-pipe (string-append - #$(file-append wireguard-tools "/bin/wg") + #$(file-append wireguard "/bin/wg") " genkey"))) (key (read-line pipe))) (call-with-output-file #$private-key