From 3e2334d9457c4bd9ccd9c720de2cf298f0c8f122 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Thu, 15 Feb 2024 21:20:32 +0000
Subject: gnu: go-github-com-mattn-go-shellwords: Move to golang-xyz.

* gnu/packages/golang.scm (go-github-com-mattn-go-shellwords): Move from
here ...
* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/terminals.scm: Add (gnu packages golang-xyz) module.

Change-Id: Icedf167f4477c6a84fd1b897ca208d6e737efb48
---
 gnu/packages/golang-xyz.scm | 34 +++++++++++++++++++++++++++++++++-
 gnu/packages/golang.scm     | 30 ------------------------------
 gnu/packages/terminals.scm  |  1 +
 3 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 41821af92b..50beb0dffe 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,11 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
 ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
 ;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
-;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -470,6 +472,36 @@ Differentiation between text and binary files}.
     (description "This package provides an idiomatic Go retry module.")
     (license license:expat)))
 
+(define-public go-github-com-mattn-go-shellwords
+  (package
+    (name "go-github-com-mattn-go-shellwords")
+    (version "1.0.12")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mattn/go-shellwords")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0l0l5s4hlsrm4z6hygig2pp1qirk5ycrzn9z27ay3yvg9k7zafzx"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/mattn/go-shellwords"
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-sh-path
+           (lambda* (#:key import-path #:allow-other-keys)
+             (substitute* (string-append
+                           "src/" import-path "/util_posix.go")
+               (("/bin/sh") (which "sh"))))))))
+    (home-page "https://github.com/mattn/go-shellwords")
+    (synopsis "Parse lines into shell words")
+    (description "This package parses text into shell arguments.  Based on
+the @code{cpan} module @code{Parse::CommandLine}.")
+    (license license:expat)))
+
 (define-public go-github-com-miekg-dns
   (package
     (name "go-github-com-miekg-dns")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f6dc0a4f45..7cc532d223 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6056,36 +6056,6 @@ exploration and data entry.")
      "The terminfo package implements terminfo database reading for Go.")
     (license license:expat)))
 
-(define-public go-github-com-mattn-go-shellwords
-  (package
-    (name "go-github-com-mattn-go-shellwords")
-    (version "1.0.12")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/mattn/go-shellwords")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0l0l5s4hlsrm4z6hygig2pp1qirk5ycrzn9z27ay3yvg9k7zafzx"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/mattn/go-shellwords"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-sh-path
-           (lambda* (#:key import-path #:allow-other-keys)
-             (substitute* (string-append
-                           "src/" import-path "/util_posix.go")
-               (("/bin/sh") (which "sh"))))))))
-    (home-page "https://github.com/mattn/go-shellwords")
-    (synopsis "Parse lines into shell words")
-    (description "This package parses text into shell arguments.  Based on
-the @code{cpan} module @code{Parse::CommandLine}.")
-    (license license:expat)))
-
 (define-public go-github-com-burntsushi-locker
   (let ((commit "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a")
         (revision "0"))
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f2af00cfa4..ef187c6ced 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -92,6 +92,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libcanberra)
-- 
cgit v1.2.3