bug#25728: [PATCH 2/2] gnu: Add colorforth.

[ng0 <contact.ng0@cryptolab.net>]

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

Version two of the patches attached.
-- 
PGP and more: https://people.pragmatique.xyz/ng0/

[-- Attachment #2: 0001-gnu-Rename-gforth-module-to-forth.patch --]
[-- Type: text/plain, Size: 1830 bytes --]

From 56502e9a3b9b0cbb84322238233ad70a9057750e Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Thu, 6 Oct 2016 22:08:31 +0000
Subject: [PATCH 1/2] gnu: Rename gforth module to forth.

* gnu/local.mk (GNU_SYSTEM_MODULES): Rename gforth.scm to forth.scm.
* gnu/packages/gforth.scm: Rename file to forth.scm.
* gnu/packages/forth.scm: Renamed from gforth.scm.
---
 gnu/local.mk                           | 2 +-
 gnu/packages/{gforth.scm => forth.scm} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename gnu/packages/{gforth.scm => forth.scm} (98%)

diff --git a/gnu/local.mk b/gnu/local.mk
index 82e94171b..385e323aa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -140,6 +140,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/fonts.scm			\
   %D%/packages/fontutils.scm			\
   %D%/packages/fpga.scm				\
+  %D%/packages/forth.scm			\
   %D%/packages/freedesktop.scm			\
   %D%/packages/freeipmi.scm			\
   %D%/packages/ftp.scm				\
@@ -154,7 +155,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/gdb.scm				\
   %D%/packages/geo.scm				\
   %D%/packages/gettext.scm			\
-  %D%/packages/gforth.scm			\
   %D%/packages/ghostscript.scm			\
   %D%/packages/gimp.scm				\
   %D%/packages/gkrellm.scm			\
diff --git a/gnu/packages/gforth.scm b/gnu/packages/forth.scm
similarity index 98%
rename from gnu/packages/gforth.scm
rename to gnu/packages/forth.scm
index b2a67ce58..6d66faf5d 100644
--- a/gnu/packages/gforth.scm
+++ b/gnu/packages/forth.scm
@@ -17,7 +17,7 @@
 ;;; 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 gforth)
+(define-module (gnu packages forth)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
-- 
2.12.2


[-- Attachment #3: 0002-gnu-Add-colorforth.patch --]
[-- Type: text/plain, Size: 3037 bytes --]

From 9c0221c7558b6d87124563fdc4fdde5c32a0374d Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Thu, 6 Oct 2016 22:31:46 +0000
Subject: [PATCH 2/2] gnu: Add colorforth.

* gnu/packages/forth.scm (colorforth): New variable.
---
 gnu/packages/forth.scm | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm
index 6d66faf5d..42723b2a5 100644
--- a/gnu/packages/forth.scm
+++ b/gnu/packages/forth.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -21,7 +21,9 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages m4))
 
 (define-public gforth
@@ -58,3 +60,43 @@ and history.  A generic virtual machine environment, vmgen, is also
 included.")
     (home-page "https://www.gnu.org/software/gforth/")
     (license license:gpl3+)))
+
+(define-public colorforth
+  (let ((commit "94aec438f1ded202681f18801b98c52dc3beee41")
+        (revision "1"))
+    (package
+      (name "colorforth")
+      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/narke/colorForth")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0s602k568bm6vmvpahsms77liicg38vksn59j5m8ax4h9l9ca77r"))))
+      (arguments
+       `(#:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure) ;No configure script
+           (replace 'install ;No install target
+             (lambda* (#:key outputs #:allow-other-keys)
+               (install-file "cf2012.img"
+                             (string-append (assoc-ref outputs "out")
+                                            "/bin"))
+               #t)))))
+      (native-inputs
+       `(("nasm" ,nasm)))
+      (build-system gnu-build-system)
+      (home-page "https://github.com/narke/colorForth")
+      (synopsis "Native 32-bit colorForth for PCs, Bochs and Qemu")
+      (description
+       "Colorforth is a @code{colorForth} implementation written in
+x86 assembly.  It is a dialect of Forth that uses color to replace
+punctation, includes its own operating system and produces extremely
+compact programs.  Applications compile from pre-parsed source.
+Colorforth applications can be run using @code{Bochs} and @code{Qemu}.
+It is adapted from @url{http://sourceforge.net/projects/colorforth,
+colorforth}.")
+      (license license:public-domain))))
-- 
2.12.2