aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/mg.scm76
-rw-r--r--gnu/packages/text-editors.scm51
3 files changed, 51 insertions, 77 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 9dfca9dbb7..724c6b6758 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -270,7 +270,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/mes.scm \
%D%/packages/messaging.scm \
%D%/packages/mingw.scm \
- %D%/packages/mg.scm \
%D%/packages/microcom.scm \
%D%/packages/moe.scm \
%D%/packages/monitoring.scm \
diff --git a/gnu/packages/mg.scm b/gnu/packages/mg.scm
deleted file mode 100644
index 5df6770009..0000000000
--- a/gnu/packages/mg.scm
+++ /dev/null
@@ -1,76 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.org>
-;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
-;;;
-;;; 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 mg)
- #:use-module (guix licenses)
- #:use-module (guix download)
- #:use-module (guix packages)
- #:use-module (guix build-system gnu)
- #:use-module (gnu packages libbsd)
- #:use-module (gnu packages ncurses)
- #:use-module (gnu packages pkg-config))
-
-(define-public mg
- (package
- (name "mg")
- (version "20161005")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://homepage.boetes.org/software/mg/mg-"
- version ".tar.gz"))
- (sha256
- (base32
- "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (substitute* "GNUmakefile"
- (("/usr/bin/") ""))))))
- (build-system gnu-build-system)
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (inputs
- `(("libbsd" ,libbsd)
- ("ncurses" ,ncurses)))
- (arguments
- ;; No test suite available.
- '(#:tests? #f
- #:make-flags (list (string-append "prefix=" %output)
- "CURSES_LIBS=-lncurses"
- "CC=gcc")
- #:phases (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'install 'patch-tutorial-location
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "mg.1"
- (("/usr") (assoc-ref outputs "out")))
- #t))
- (add-after 'install 'install-tutorial
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/mg")))
- (install-file "tutorial" doc)
- #t))))))
- (home-page "http://homepage.boetes.org/software/mg/")
- (synopsis "Microscopic GNU Emacs clone")
- (description
- "Mg (mg) is a GNU Emacs style editor, with which it is \"broadly\"
-compatible. This is a portable version of the mg maintained by the OpenBSD
-team.")
- (license public-domain)))
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 56049eb510..756c2beab2 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Feng Shu <tumashu@163.com>
;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
+;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,7 @@
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages libbsd)
#:use-module (gnu packages lua)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
@@ -228,3 +230,52 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on
16, 32, and 64-bit CPUs.")
(supported-systems '("x86_64-linux" "i686-linux"))
(license license:gpl2+)))
+
+(define-public mg
+ (package
+ (name "mg")
+ (version "20161005")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://homepage.boetes.org/software/mg/mg-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "GNUmakefile"
+ (("/usr/bin/") ""))))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libbsd" ,libbsd)
+ ("ncurses" ,ncurses)))
+ (arguments
+ ;; No test suite available.
+ '(#:tests? #f
+ #:make-flags (list (string-append "prefix=" %output)
+ "CURSES_LIBS=-lncurses"
+ "CC=gcc")
+ #:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'install 'patch-tutorial-location
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "mg.1"
+ (("/usr") (assoc-ref outputs "out")))
+ #t))
+ (add-after 'install 'install-tutorial
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (string-append out "/share/doc/mg")))
+ (install-file "tutorial" doc)
+ #t))))))
+ (home-page "http://homepage.boetes.org/software/mg/")
+ (synopsis "Microscopic GNU Emacs clone")
+ (description
+ "Mg (mg) is a GNU Emacs style editor, with which it is \"broadly\"
+compatible. This is a portable version of the mg maintained by the OpenBSD
+team.")
+ (license license:public-domain)))