sharlatan pushed a commit to branch go-team
in repository guix.

commit 140dc44f6d1ec70f909de8671970b6393c307e40
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Tue Dec 3 09:24:36 2024 +0000

    gnu: go-github-com-vishvananda-netlink: Move to golang-web.
    
    * gnu/packages/linux.scm (go-github-com-vishvananda-netlink): Move from
    here ...
    * gnu/packages/golang-web.scm: ... to here.
    
    * gnu/packages/docker.scm: Add golang-web module.
    
    Change-Id: I67bc7128e6ede1c717aefc089dbe3776dd885e40
---
 gnu/packages/docker.scm     |  1 +
 gnu/packages/golang-web.scm | 37 +++++++++++++++++++++++++++++++++++++
 gnu/packages/linux.scm      | 36 ------------------------------------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 0abe85f01e..94411d924f 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-web)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ff783581a6..23871e8c85 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017, 2019, 2020, 2021 Leo Famulari <[email protected]>
 ;;; Copyright © 2018 Pierre Neidhardt <[email protected]>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <[email protected]>
+;;; Copyright © 2019 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2019 Vagrant Cascadian <[email protected]>
 ;;; Copyright © 2019, 2020 Martin Becze <[email protected]>
 ;;; Copyright © 2020 Jack Hill <[email protected]>
@@ -5872,6 +5873,42 @@ encoding library for the MessagePack, CBOR, JSON and the 
Binc formats.")
 replacement for native @code{net/http} module.")
     (license license:expat)))
 
+(define-public go-github-com-vishvananda-netlink
+  (package
+    (name "go-github-com-vishvananda-netlink")
+    (version "1.3.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 "1ckwb1ml7i2ccdd7kzc04s839naf4arlxav2ip5kf4rm4xhba9g7"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      ;; The tests are unsupported on all architectures except x86_64-linux:
+      ;; cannot use 0xabcdef99 (untyped int constant 2882400153) as int value
+      ;; in struct literal (overflows)
+      #:tests? (and (not (%current-target-system)) (target-x86-64?))
+      #:test-flags
+      ;; One test fails with error: operation not permitted.
+      #~(list "-skip" "TestSocketXDPGetInfo")
+      #:import-path "github.com/vishvananda/netlink"))
+    (propagated-inputs
+     (list go-github-com-vishvananda-netns
+           go-golang-org-x-sys))
+    (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-github-com-whyrusleeping-cbor
   (package
     (name "go-github-com-whyrusleeping-cbor")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 00a79f57b4..ffebe90e16 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9576,42 +9576,6 @@ nfnetlink_queue, nfnetlink_conntrack) and their 
respective users and/or
 management tools in userspace.")
     (license license:gpl2)))
 
-(define-public go-github-com-vishvananda-netlink
-  (package
-    (name "go-github-com-vishvananda-netlink")
-    (version "1.3.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 "1ckwb1ml7i2ccdd7kzc04s839naf4arlxav2ip5kf4rm4xhba9g7"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      ;; The tests are unsupported on all architectures except x86_64-linux:
-      ;; cannot use 0xabcdef99 (untyped int constant 2882400153) as int value
-      ;; in struct literal (overflows)
-      #:tests? (and (not (%current-target-system)) (target-x86-64?))
-      #:test-flags
-      ;; One test fails with error: operation not permitted.
-      #~(list "-skip" "TestSocketXDPGetInfo")
-      #:import-path "github.com/vishvananda/netlink"))
-    (propagated-inputs
-     (list go-github-com-vishvananda-netns
-           go-golang-org-x-sys))
-    (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")

Reply via email to