[PATCH 1/1] gnu: Move cursynth to (gnu packages music).

[Leo Famulari]

* gnu/packages/cursynth.scm: Remove.
* gnu/packages/music.scm (cursynth): New variable, from cursynth.scm.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove cursynth.scm.
---
 gnu-system.am             |  1 -
 gnu/packages/cursynth.scm | 53 -----------------------------------------------
 gnu/packages/music.scm    | 27 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 54 deletions(-)
 delete mode 100644 gnu/packages/cursynth.scm

diff --git a/gnu-system.am b/gnu-system.am
index e1874fa..8aca139 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -76,7 +76,6 @@ GNU_SYSTEM_MODULES =                          \
   gnu/packages/cryptsetup.scm                  \
   gnu/packages/cups.scm                                \
   gnu/packages/curl.scm                                \
-  gnu/packages/cursynth.scm                    \
   gnu/packages/cyrus-sasl.scm                  \
   gnu/packages/databases.scm                   \
   gnu/packages/datamash.scm                    \
diff --git a/gnu/packages/cursynth.scm b/gnu/packages/cursynth.scm
deleted file mode 100644
index 80f86da..0000000
--- a/gnu/packages/cursynth.scm
+++ /dev/null
@@ -1,53 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Eric Bavier <address@hidden>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages cursynth)
-  #:use-module (guix packages)
-  #:use-module (guix licenses)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages linux))
-
-(define-public cursynth
-  (package
-    (name "cursynth")
-    (version "1.5")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/cursynth/cursynth-"
-                          version ".tar.gz"))
-      (sha256
-       (base32 "1dhphsya41rv8z6yqcv9l6fwbslsds4zh1y56zizi39nd996d40v"))
-      (patches (list (search-patch "cursynth-wave-rand.patch")))))
-    (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    ;; TODO: See https://github.com/iyoko/cursynth/issues/4 which currently
-    ;; prevents us from using pulseaudio
-    (inputs `(("ncurses" ,ncurses)
-              ("alsa" ,alsa-lib)))
-    (home-page "http://www.gnu.org/software/cursynth";)
-    (synopsis "Polyphonic and MIDI subtractive music synthesizer using curses")
-    (description "GNU cursynth is a polyphonic synthesizer that runs
-graphically in the terminal.  It is built on a full-featured subtractive
-synthesis engine.  Notes and parameter changes may be entered via MIDI or the
-computer's keyboard.")
-    (license gpl3+)))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 3787576..b3cdbdc 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2015 Paul van der Walt <address@hidden>
 ;;;
@@ -1002,3 +1003,29 @@ synthesizer.  It offers three synthesizer engines, 
multitimbral and polyphonic
 synths, microtonal capabilities, custom envelopes, effects, etc.  Yoshimi
 improves on support for JACK features, such as JACK MIDI.")
     (license license:gpl2)))
+
+(define-public cursynth
+  (package
+    (name "cursynth")
+    (version "1.5")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/cursynth/cursynth-"
+                          version ".tar.gz"))
+      (sha256
+       (base32 "1dhphsya41rv8z6yqcv9l6fwbslsds4zh1y56zizi39nd996d40v"))
+      (patches (list (search-patch "cursynth-wave-rand.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    ;; TODO: See https://github.com/iyoko/cursynth/issues/4 which currently
+    ;; prevents us from using pulseaudio
+    (inputs `(("ncurses" ,ncurses)
+              ("alsa" ,alsa-lib)))
+    (home-page "http://www.gnu.org/software/cursynth";)
+    (synopsis "Polyphonic and MIDI subtractive music synthesizer using curses")
+    (description "GNU cursynth is a polyphonic synthesizer that runs
+graphically in the terminal.  It is built on a full-featured subtractive
+synthesis engine.  Notes and parameter changes may be entered via MIDI or the
+computer's keyboard.")
+    (license license:gpl3+)))
-- 
2.6.4