2 files changed, 39 insertions(+), 38 deletions(-)

M gnu/packages/golang-web.scm
M gnu/packages/ipfs.scm

@@ 6203,44 6203,6 @@ to delete records.
 @end itemize")
     (license license:expat)))
 
-(define-public go-github-com-libp2p-go-cidranger
-  (package
-    (name "go-github-com-libp2p-go-cidranger")
-    (version "1.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/libp2p/go-cidranger")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "05hzlk5hx7qna5znr3q1crr0qb7h8yrv1v96pj015dh0kbdkdaba"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      ;; XXX: Check if the most of the tests may be enabled:
-      ;; src/github.com/libp2p/go-cidranger/trie_test.go:557:8: cannot use
-      ;; 4294967295 (untyped int constant) as int value in assignment
-      ;; (overflows).
-      #:tests? (and (target-64bit?)
-                    (not (%current-target-system)))
-      #:import-path "github.com/libp2p/go-cidranger"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-ipfs-go-detect-race))
-    (home-page "https://github.com/libp2p/go-cidranger")
-    (synopsis "Fast IP to CIDR lookup in Golang")
-    (description
-     "Fast IP to @url{https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing,
-CIDR} block(s) lookup using trie in Golang, inspired by
-@url{https://vincent.bernat.im/en/blog/2017-ipv4-route-lookup-linux, IPv4
-route lookup Linux}.  Possible use cases include detecting if a IP address is
-from published cloud provider CIDR blocks (e.g. 52.95.110.1 is contained in
-published AWS Route53 CIDR 52.95.110.0/24), IP routing rules, etc.")
-    (license license:expat)))
-
 (define-public go-github-com-libp2p-go-doh-resolver
   (package
     (name "go-github-com-libp2p-go-doh-resolver")

@@ 30,6 30,7 @@
   #:use-module (guix git-download)
   #:use-module (guix download)
   #:use-module (guix build-system go)
+  #:use-module (guix utils)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages golang)


@@ 1843,6 1844,44 @@ for distributing DNS subdomains with CA-signed TLS certificates to libp2p
 peers.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public go-github-com-libp2p-go-cidranger
+  (package
+    (name "go-github-com-libp2p-go-cidranger")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/libp2p/go-cidranger")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "05hzlk5hx7qna5znr3q1crr0qb7h8yrv1v96pj015dh0kbdkdaba"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      ;; XXX: Check if the most of the tests may be enabled:
+      ;; src/github.com/libp2p/go-cidranger/trie_test.go:557:8: cannot use
+      ;; 4294967295 (untyped int constant) as int value in assignment
+      ;; (overflows).
+      #:tests? (and (target-64bit?)
+                    (not (%current-target-system)))
+      #:import-path "github.com/libp2p/go-cidranger"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-detect-race))
+    (home-page "https://github.com/libp2p/go-cidranger")
+    (synopsis "Fast IP to CIDR lookup in Golang")
+    (description
+     "Fast IP to @url{https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing,
+CIDR} block(s) lookup using trie in Golang, inspired by
+@url{https://vincent.bernat.im/en/blog/2017-ipv4-route-lookup-linux, IPv4
+route lookup Linux}.  Possible use cases include detecting if a IP address is
+from published cloud provider CIDR blocks (e.g. 52.95.110.1 is contained in
+published AWS Route53 CIDR 52.95.110.0/24), IP routing rules, etc.")
+    (license license:expat)))
+
 (define-public go-github-com-libp2p-go-libp2p
   (package
     (name "go-github-com-libp2p-go-libp2p")