From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54607)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1czQ9G-0000Is-2i
	for guix-patches@gnu.org; Sat, 15 Apr 2017 12:02:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1czQ9C-0003Bt-Uc
	for guix-patches@gnu.org; Sat, 15 Apr 2017 12:02:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:50938)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1czQ9C-0003Bf-L0
	for guix-patches@gnu.org; Sat, 15 Apr 2017 12:02:02 -0400
Subject: bug#25728: [PATCH 2/2] gnu: Add colorforth.
Resent-Message-ID: <handler.25728.B25728.149227207215235@debbugs.gnu.org>
Date: Sat, 15 Apr 2017 16:00:53 +0000
From: ng0 <contact.ng0@cryptolab.net>
Message-ID: <20170415160053.qqqpga27hqsdhet3@abyayala>
References: <20170214185339.25538-1-contact.ng0@cryptolab.net>
	<20170214185339.25538-2-contact.ng0@cryptolab.net>
	<871suvu8yu.fsf@elephly.net>
	<20170415152843.2vyk7uhycuny5rov@abyayala>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="ikf4ypsjh2aukdsx"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20170415152843.2vyk7uhycuny5rov@abyayala>
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Ricardo Wurmus <rekado@elephly.net>, 25728@debbugs.gnu.org


--ikf4ypsjh2aukdsx
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline

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

--ikf4ypsjh2aukdsx
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="0001-gnu-Rename-gforth-module-to-forth.patch"

>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


--ikf4ypsjh2aukdsx
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="0002-gnu-Add-colorforth.patch"
Content-Transfer-Encoding: 8bit

>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


--ikf4ypsjh2aukdsx--