From patchwork Wed Mar 23 18:48:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 38031 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 66D8027BBEA; Wed, 23 Mar 2022 18:51:09 +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,FREEMAIL_FROM,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 D386C27BBE9 for ; Wed, 23 Mar 2022 18:51:08 +0000 (GMT) Received: from localhost ([::1]:57630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nX64a-0006R6-1X for patchwork@mira.cbaines.net; Wed, 23 Mar 2022 14:51:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nX63Z-0005V6-Bx for guix-patches@gnu.org; Wed, 23 Mar 2022 14:50:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nX63X-0003Dv-FP for guix-patches@gnu.org; Wed, 23 Mar 2022 14:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nX63X-0001Fw-Cw for guix-patches@gnu.org; Wed, 23 Mar 2022 14:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54539] [PATCH 4/6] gnu: go-netlink: Move to (gnu packages networking) to break cycles. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Mar 2022 18:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54539 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54539@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 54539-submit@debbugs.gnu.org id=B54539.16480613534702 (code B ref 54539); Wed, 23 Mar 2022 18:50:03 +0000 Received: (at 54539) by debbugs.gnu.org; 23 Mar 2022 18:49:13 +0000 Received: from localhost ([127.0.0.1]:46008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nX62i-0001Dg-Q2 for submit@debbugs.gnu.org; Wed, 23 Mar 2022 14:49:13 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:33982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nX62Z-0001Ck-Ja for 54539@debbugs.gnu.org; Wed, 23 Mar 2022 14:49:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id 9up12700i4UW6Th01up2oK; Wed, 23 Mar 2022 19:49:02 +0100 From: Maxime Devos Date: Wed, 23 Mar 2022 18:48:53 +0000 Message-Id: <20220323184855.25241-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220323184855.25241-1-maximedevos@telenet.be> References: <20220323184855.25241-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1648061342; bh=r68AuVIPLdqOwyIpAkR7zIOnNLB0Y0HfiXxBPvpnuY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Mx2y8MvZT84hWvsHX3gnLjcePMrocv8nZrBqR0+va4vvdE4fg2sRsxvCHUQNWPdoh 5/jMwcNh2wLpyOTGJMBkTI/aXQmwaTCsftsQONDFP5+OmuLOtKlC0gNo1X7tgA6yLz 4sQDCXsIPE7XIUNLeEMs8F3IhWLr8Lko93Ht0+SL8I7bwi+1om01IpWbOwpj7kbfZH cELFnn8YmiNPVfOgVu9oubiC85D3EvVJjwAtCkoLDqphFmRgMbBxxgJFUcChq8LNnS XRaCg8AnxD1RTiGn6QQt6C6w4JVVNjDSschSUhzKNouv8PjwGwIHwo+xsov6g+9mUX PGLKPENgJZU1A== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This (partially?) breaks a cycle between (gnu packages linux) and (gnu packages networking). * gnu/packages/linux.scm (go-netlink): Move to ... * gnu/packages/networking.scm: ... this module. --- gnu/packages/linux.scm | 30 ++---------------------------- gnu/packages/networking.scm | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6ce640ddf2..5a0c5650e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -125,7 +125,8 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) - #:use-module (gnu packages networking) + ;; Don't import that module here, otherwise a cycle would result. + ;; #:use-module (gnu packages networking) #:use-module (gnu packages ninja) #:use-module (gnu packages nss) #:use-module (gnu packages perl) @@ -159,7 +160,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system trivial) @@ -7620,32 +7620,6 @@ nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or management tools in userspace.") (license license:gpl2))) -(define-public go-netlink - (package - (name "go-netlink") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vishvananda/netlink") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/vishvananda/netlink")) - (native-inputs - (list go-golang-org-x-sys go-netns)) - (home-page "https://github.com/vishvananda/netlink") - (synopsis "Simple netlink library for Go") - (description "The netlink package provides a simple netlink library for -Go. Netlink is the interface a user-space program in Linux uses to -communicate with the kernel. It can be used to add and remove interfaces, set -IP addresses and routes, and configure IPsec.") - (license license:asl2.0))) - (define-public libinih (package (name "libinih") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b45f2f79f2..e8720e0faf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1663,6 +1663,34 @@ manage, and delete Internet resources from Gandi.net such as domain names, virtual machines, and certificates.") (license license:gpl3+))) +;; Don't put this in (gnu packages linux) even though it is Linux-specific, +;; because that would create cycles. +(define-public go-netlink + (package + (name "go-netlink") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netlink") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/vishvananda/netlink")) + (native-inputs + (list go-golang-org-x-sys go-netns)) + (home-page "https://github.com/vishvananda/netlink") + (synopsis "Simple netlink library for Go") + (description "The netlink package provides a simple netlink library for +Go. Netlink is the interface a user-space program in Linux uses to +communicate with the kernel. It can be used to add and remove interfaces, set +IP addresses and routes, and configure IPsec.") + (license license:asl2.0))) + (define-public go-netns (let ((commit "13995c7128ccc8e51e9a6bd2b551020a27180abd") (revision "1"))