diff mbox series

[bug#66827,v3,02/66] gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web).

Message ID 7942ea1d12b00fb231223ee20714b4ecfcb45220.1701297273.git.sharlatanus@gmail.com
State New
Headers show
Series [bug#66827,v3,01/66] gnu: Add (gnu packages golang-web) module. | expand

Commit Message

Sharlatan Hellseher Nov. 29, 2023, 10:34 p.m. UTC 
* gnu/packages/golang.scm (go-github-com-gorilla-mux): Move from
here...
* gnu/packages/golang-web.scm: ...to here.

* gnu/packages/finance.scm: Add (gnu packages golang-web) module.
* gnu/packages/web.scm: As above...

Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada
---
 gnu/packages/finance.scm    |  1 +
 gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++
 gnu/packages/golang.scm     | 24 ------------------------
 gnu/packages/web.scm        |  1 +
 4 files changed, 27 insertions(+), 24 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index cd419f2102..5ff86bcb72 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -93,6 +93,7 @@  (define-module (gnu packages finance)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-web)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gsasl)
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index feb2854d9c..c779600411 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1,4 +1,6 @@ 
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +34,29 @@  (define-module (gnu packages golang-web)
 ;;;
 ;;; Code:
 
+(define-public go-github-com-gorilla-mux
+  (package
+    (name "go-github-com-gorilla-mux")
+    (version "1.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/gorilla/mux")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/gorilla/mux"))
+    (home-page "https://github.com/gorilla/mux")
+    (synopsis "URL router and dispatcher for Go")
+    (description
+     "Gorilla/Mux implements a request router and dispatcher for matching
+incoming requests with their respective handler.")
+    (license license:bsd-3)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5e9211026b..7e796db5a9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4737,30 +4737,6 @@  (define-public go-github-com-gorilla-context
       (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
       (license license:bsd-3))))
 
-(define-public go-github-com-gorilla-mux
-  (package
-    (name "go-github-com-gorilla-mux")
-    (version "1.8.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/gorilla/mux")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/gorilla/mux"))
-    (home-page "https://github.com/gorilla/mux")
-    (synopsis "URL router and dispatcher for Go")
-    (description
-     "Gorilla/Mux implements a request router and dispatcher for matching
-incoming requests with their respective handler.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-andybalholm-brotli
   (package
     (name "go-github-com-andybalholm-brotli")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4a4252138b..3837dcb043 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -142,6 +142,7 @@  (define-module (gnu packages web)
   #:use-module (gnu packages gnunet)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-web)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)