[bug#47104] [PATCH 1/2] gnu: Add grumble.

[jgart via Guix-patches via <guix-patches@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

Hi Guix!

Here is grumble, an alternative mumble server implemented in golang.

go-github-com-gorilla-websocket was the only dependency we needed to package for it.

Now, to create a grumble-service-type :)

This was packaged by myself, donotshake, and Raghav Gururajan while communicating on a grumble instance and pair programming over tmate. All the co-authors are listed in the commit message.

Thank you,

jgart

libremiami.org
mumble.libremiami.org

[-- Attachment #2: 0001-gnu-Add-go-github-com-gorilla-websocket.patch --]
[-- Type: application/octet-stream, Size: 2733 bytes --]

From f9c36cd8be5eac9802c6a03d362e955ab8ab7511 Mon Sep 17 00:00:00 2001
From: LibreMiami <packaging-guix@libremiami.org>
Date: Fri, 12 Mar 2021 10:54:51 -0500
Subject: [PATCH 1/2] gnu: Add go-github-com-gorilla-websocket.

* gnu/packages/golang.scm (go-github-com-gorilla-websocket):
New variable.

Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
Co-authored-by: donotshake <donotshake:matrix.org>
Co-authored-by: jgart <jgart@dismail.de>
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 849227d693..b8a4027420 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4809,7 +4810,7 @@ test results.")
 (define-public go-github-com-golang-protobuf-proto
   (package
     (name "go-github-com-golang-protobuf-proto")
-    (version "1.3.1")
+    (version "1.3.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4818,7 +4819,7 @@ test results.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"))))
+                "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/golang/protobuf/proto"
@@ -6773,3 +6774,23 @@ compressed streams in Go.")
       (description "Package ed25519 implements the Ed25519 signature
 algorithm.")
       (license license:bsd-3))))
+
+(define-public go-github-com-gorilla-websocket
+  (package
+    (name "go-github-com-gorilla-websocket")
+    (version "1.4.2")
+    (home-page "https://github.com/gorilla/websocket")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "0mkm9w6kjkrlzab5wh8p4qxkc0icqawjbvr01d2nk6ykylrln40s"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/gorilla/websocket"))
+    (synopsis "Well-tested and widely used WebSocket implementation for Go")
+    (description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.")
+    (license license:bsd-2)))
-- 
2.30.2


[-- Attachment #3: 0002-gnu-Add-grumble.patch --]
[-- Type: application/octet-stream, Size: 3112 bytes --]

From 3430f134746a4c8aa5c0f1e8ba4e706a46f95770 Mon Sep 17 00:00:00 2001
From: LibreMiami <packaging-guix@libremiami.org>
Date: Fri, 12 Mar 2021 11:00:00 -0500
Subject: [PATCH 2/2] gnu: Add grumble.

* gnu/packages/telephony.scm (grumble):
New variable.

Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
Co-authored-by: donotshake <donotshake:matrix.org>
Co-authored-by: jgart <jgart@dismail.de>
---
 gnu/packages/telephony.scm | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 5c8d247e68..f6f2312d65 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -59,6 +59,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libcanberra)
@@ -92,6 +93,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
   #:use-module (guix build-system qt))
 
 (define-public libilbc
@@ -915,3 +917,40 @@ Initiation Protocol (SIP) and a multimedia framework.")
 telephony functionality into custom Telegram clients.")
     (home-page "https://github.com/zevlg/libtgvoip")
     (license license:unlicense)))
+
+(define-public grumble
+  (let ((commit "6f8c2bf2f51fddc1cb09e3385bc4e9db5dc43ba9")
+        (revision "335"))
+    (package
+      (name "grumble")
+      (version (git-version "0.0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/mumble-voip/grumble")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0yvh1k1ag56b5myg479hs6c296h9c19l43qbjmf0qwa6n4j3rvss"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:unpack-path "github.com/mumble-voip/grumble"
+         #:import-path "github.com/mumble-voip/grumble/cmd/grumble"
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch
+             (lambda* (#:key unpack-path #:allow-other-keys)
+               (substitute* (find-files "." "\\.go$")
+                 (("mumble.info/grumble/pkg")
+                  (string-append unpack-path "/pkg")))
+               #t)))))
+      (inputs
+       `(("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto)
+         ("go-github-com-gorilla-websocket" ,go-github-com-gorilla-websocket)
+         ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)))
+      (synopsis "Alternative Mumble server")
+      (description "Grumble is an implementation of a server for the Mumble
+voice chat system.  It is an alternative to Murmur, the typical Mumble server.")
+      (home-page "https://github.com/mumble-voip/grumble")
+      (license license:bsd-3))))
-- 
2.30.2