gforth->forth, add colorforth for review

gforth->forth, add colorforth for review

[ng0]

The following 2 patches move gforth.scm to forth.scm as originally intended and previously discussed here, and they also add colorforth.
However for the lack of native 32bit or the author providing bad instructions (https://github.com/narke/colorForth) I need someone who either tells me this is bad, don't add it or who can actually run it..
I'm waiting for a PSU for my old i686 board.
Qemu as build by guix on x86_64 GuixSD when run with "qemu-system-i386 -boot a -fda cf2012.img" says
a long version of "nope!" and refuses to fully start this. I'm no expert in qemu yet..

[PATCH 1/2] gnu: Rename gforth module to forth.
[PATCH 2/2] gnu: Add colorforth.

[PATCH 1/2] gnu: Rename gforth module to forth.

[ng0]

* 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} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename gnu/packages/{gforth.scm => forth.scm} (96%)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1ce95f2..3094c75 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -127,6 +127,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/fltk.scm				\
   %D%/packages/fonts.scm			\
   %D%/packages/fontutils.scm			\
+  %D%/packages/forth.scm			\
   %D%/packages/freedesktop.scm			\
   %D%/packages/freeipmi.scm			\
   %D%/packages/ftp.scm				\
@@ -142,7 +143,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/geo.scm				\
   %D%/packages/geeqie.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 96%
rename from gnu/packages/gforth.scm
rename to gnu/packages/forth.scm
index b2a67ce..67de966 100644
--- a/gnu/packages/gforth.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 ng0 <ngillmann@runbox.com>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -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.10.1

[PATCH 2/2] gnu: Add colorforth.

[ng0]

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

diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm
index 67de966..8f32455 100644
--- a/gnu/packages/forth.scm
+++ b/gnu/packages/forth.scm
@@ -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,39 @@ 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 ; There is no 'install
+             (lambda _
+               (install-file "cf2012.img"
+                             (string-append (assoc-ref %outputs "out")
+                                            "/bin")))))))
+      (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
+       "Native colorForth for 32-bit PCs, at least compilable on Linux
+ and runnable on both Bochs and Qemu.  It is adapted from
+ @url{http://sourceforge.net/projects/colorforth, colorforth}.
+ The original colorforth is public domain software.")
+      (license license:public-domain)))) ; clarify upstream
-- 
2.10.1