From patchwork Sun Feb 11 18:28:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 60092 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 882FF27BBE9; Sun, 11 Feb 2024 18:30:43 +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_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 548FD27BBE2 for ; Sun, 11 Feb 2024 18:30:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZEaO-0005qg-P7; Sun, 11 Feb 2024 13:29:52 -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 1rZEaM-0005pO-DM for guix-patches@gnu.org; Sun, 11 Feb 2024 13:29:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZEaM-0008FT-4v for guix-patches@gnu.org; Sun, 11 Feb 2024 13:29:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZEac-0003YP-ET for guix-patches@gnu.org; Sun, 11 Feb 2024 13:30:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54335] [PATCH v4 12/12] gnu: nebula: Update to 1.8.2. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Feb 2024 18:30:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54335@debbugs.gnu.org Received: via spool by 54335-submit@debbugs.gnu.org id=B54335.170767615613455 (code B ref 54335); Sun, 11 Feb 2024 18:30:06 +0000 Received: (at 54335) by debbugs.gnu.org; 11 Feb 2024 18:29:16 +0000 Received: from localhost ([127.0.0.1]:38001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZEZn-0003Uq-Pq for submit@debbugs.gnu.org; Sun, 11 Feb 2024 13:29:16 -0500 Received: from mail.mmer.org ([178.22.65.174]:48250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZEZe-0003S0-Nn for 54335@debbugs.gnu.org; Sun, 11 Feb 2024 13:29:07 -0500 Received: from mail.mmer.org (localhost [127.0.0.1]) by mail.mmer.org (OpenSMTPD) with ESMTP id a07603f7 for <54335@debbugs.gnu.org>; Sun, 11 Feb 2024 18:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=mmer.org; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Fw7DxN3ezbi+CraZxLX2RnYvn VVbUeSmdm7NeqIXs1Q=; b=rTG0IoM1sO4uBkAoEdpTl/rxjw+019AmB8bbMNYIz PauSNDnBBKcphoffwe/U11FBIpuPqZDoo+4y35IYgTCHQTcAtqqlGIJakUE4iJ+C JnX8+Kv2lQv7H2x+apoSvhiflzh4sP+zd86mvHYqVQU3/YWNxtVB0Y3Q8z1VkC1v jk= Received: from delta (i60212.upc-i.chello.nl [62.195.60.212]) by mail.mmer.org (OpenSMTPD) with ESMTPSA id 55810cb6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <54335@debbugs.gnu.org>; Sun, 11 Feb 2024 18:28:38 +0000 (UTC) Date: Sun, 11 Feb 2024 19:28:26 +0100 Message-ID: <20240211182830.3631-13-levenson@mmer.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240211182830.3631-1-levenson@mmer.org> References: <20240211182830.3631-1-levenson@mmer.org> MIME-Version: 1.0 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: Alexey Abramov X-ACL-Warn: , Alexey Abramov via Guix-patches X-Patchwork-Original-From: Alexey Abramov via Guix-patches via From: Alexey Abramov 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/packages/networking.scm (nebula): Change go version to 1.20. Use dario.cat/mergo v1.0.0 (previously imdario/mergo). --- gnu/packages/networking.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0addb3cedd..856c1d4f20 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4945,7 +4945,7 @@ (define-public dropwatch (define-public nebula (package (name "nebula") - (version "1.5.2") + (version "1.8.2") (source (origin (method git-fetch) (uri (git-reference @@ -4954,7 +4954,7 @@ (define-public nebula (file-name (git-file-name name version)) (sha256 (base32 - "14b7wgx83w1fhcbhsn0mfg872hkml4wwbzimb3bjvc3xpzx6w44k")) + "0ly1axgmskrkmxhzymqis6gxf2wd7rvhycm94wfb8k0hirndvg5m")) ;; Remove windows-related binary blobs and files (snippet #~(begin @@ -4963,7 +4963,8 @@ (define-public nebula (delete-file-recursively "wintun"))))) (build-system go-build-system) (arguments - `(#:import-path "github.com/slackhq/nebula" + `(#:go ,go-1.20 + #:import-path "github.com/slackhq/nebula" #:install-source? #f #:phases (modify-phases %standard-phases @@ -5001,7 +5002,7 @@ (define-public nebula go-github-com-prometheus-client-golang go-github-com-nbrownus-go-metrics-prometheus go-github-com-miekg-dns - go-github-com-imdario-mergo + go-dario-cat-mergo go-github-com-google-gopacket go-github-com-gogo-protobuf go-github-com-flynn-noise