* [PATCH] gnu: Add Chez-Scheme.
@ 2016-05-13 19:03 Federico Beffa
2016-05-13 20:44 ` Andreas Enge
0 siblings, 1 reply; 7+ messages in thread
From: Federico Beffa @ 2016-05-13 19:03 UTC (permalink / raw)
To: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 108 bytes --]
There is no official release yet, so I took a snapshot of the git
repo. We can switch later.
Regards,
Fede
[-- Attachment #2: 0001-gnu-Add-Chez-Scheme.patch --]
[-- Type: text/x-patch, Size: 8015 bytes --]
From ccbc4ed7b9e92823b60d6ed17cf3320585f018b7 Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Thu, 12 May 2016 14:57:25 +0200
Subject: [PATCH] gnu: Add Chez-Scheme.
* gnu/packages/scheme.scm (chez-scheme): New variable.
---
gnu/packages/scheme.scm | 145 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 144 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 6cf75c2..86c099c 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -22,15 +22,20 @@
(define-module (gnu packages scheme)
#:use-module (gnu packages)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3))
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages m4)
#:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages databases)
#:use-module (gnu packages emacs)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages netpbm)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages texlive)
#:use-module (gnu packages base)
@@ -544,6 +549,144 @@ an isolated heap allowing multiple VMs to run simultaneously in different OS
threads.")
(license bsd-3)))
+(define nanopass
+ (let ((version "1.9"))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/nanopass/nanopass-framework-scheme/archive"
+ "/v" version ".tar.gz"))
+ (sha256 (base32 "11pwyy4jiwhcl2am3a4ciczacjbjkyvdizqzdglb3l1hj2gj6nv2"))
+ (file-name (string-append "nanopass-" version ".tar.gz")))))
+
+(define stex
+ (let ((version "1.2"))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/dybvig/stex/archive"
+ "/v" version ".tar.gz"))
+ (sha256 (base32 "0hswmckvbyzy9crj51fy4q14zprh56kvx08sj9r47vm6zkb30mki"))
+ (file-name (string-append "stex-" version ".tar.gz")))))
+
+(define-public chez-scheme
+ (package
+ (name "chez-scheme")
+ (version "20160512.41d94b07")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cisco/ChezScheme.git")
+ (commit "41d94b0793997e3b90c10d6d28aaa4e2d43857cc")))
+ (sha256
+ (base32 "18cg1r0csw1fmsndw1y2hks630q16yf8vl3jvbrbgcg1c8l4hn10"))
+ (file-name (string-append "chez-scheme-" version ".tar.gz"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("ncurses" ,ncurses)
+ ("libx11" ,libx11)
+ ("xorg-rgb" ,xorg-rgb)
+ ("nanopass" ,nanopass)
+ ("zlib" ,zlib)
+ ("stex" ,stex)))
+ (native-inputs
+ `(("texlive" ,texlive)
+ ("ghostscript" ,ghostscript)
+ ("netpbm" ,netpbm)))
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 match))
+ #:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ ;; Adapt the custom 'configure' script.
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (nanopass (assoc-ref inputs "nanopass"))
+ (stex (assoc-ref inputs "stex"))
+ (zlib (assoc-ref inputs "zlib"))
+ (unpack (assoc-ref %standard-phases 'unpack))
+ (patch-source-shebangs
+ (assoc-ref %standard-phases 'patch-source-shebangs)))
+ (map (match-lambda
+ ((src orig-name new-name)
+ (with-directory-excursion "."
+ (apply unpack (list #:source src))
+ (apply patch-source-shebangs (list #:source src)))
+ (delete-file-recursively new-name)
+ (system* "mv" orig-name new-name)))
+ `((,nanopass "nanopass-framework-scheme-1.9" "nanopass")
+ (,stex "stex-1.2" "stex")))
+ ;; The Makefile wants to download and compile "zlib". We patch
+ ;; it to use the one from our 'zlib' package.
+ (substitute* "configure"
+ (("rmdir zlib .*$") "echo \"using system zlib\"\n"))
+ (substitute* (find-files "./c" "Mf-[a-zA-Z0-9.]+")
+ (("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
+ "${Kernel}: ${kernelobj}")
+ (("ld -melf_x86_64 -r -X -o \\$\\{Kernel\\} \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
+ (string-append "ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} "
+ zlib "/lib/libz.a"))
+ (("\\(cd \\.\\./zlib; CFLAGS=-m64 \\./configure --64)")
+ (which "true"))
+ (("(cd \\.\\./zlib; make)")
+ (which "true")))
+ (substitute* (find-files "mats" "Mf-.*")
+ (("^[[:space:]]+(cc ) *") "\tgcc "))
+ (substitute*
+ (find-files "." (string-append
+ "("
+ "Mf-[a-zA-Z0-9.]+"
+ "|Makefile[a-zA-Z0-9.]*"
+ "|checkin"
+ "|stex\\.stex"
+ "|newrelease"
+ "|workarea"
+ ;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read
+ ")"))
+ (("/bin/rm") (which "rm"))
+ (("/bin/ln") (which "ln"))
+ (("/bin/cp") (which "cp")))
+ (substitute* "makefiles/installsh"
+ (("/bin/true") (which "true")))
+ (zero? (system* "./configure" "--threads"
+ (string-append "--installprefix=" out))))))
+ ;; Installation of the documentation requires a running "petite".
+ (add-after 'install 'install-doc
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
+ (doc (string-append (assoc-ref outputs "doc")
+ "/share/doc/" ,name "-" ,version)))
+ (setenv "HOME" (getcwd))
+ (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+ (substitute* "stex/src/fixbibtex.ss"
+ (("/usr/bin/petite") (which "petite")))
+ (with-directory-excursion "stex"
+ (system* "make" (string-append "BIN=" bin)))
+ (system* "make" "docs")
+ (with-directory-excursion "csug"
+ (substitute* "Makefile"
+ (("/tmp/csug9") doc))
+ (system* "make" "install")
+ (install-file "csug.pdf" doc))
+ (with-directory-excursion "release_notes"
+ (install-file "release_notes.pdf" doc))
+ #t))))))
+ ;; According to the documentation MIPS is not supported.
+ (supported-systems (delete "mips64el-linux" %supported-systems))
+ (home-page "http://www.scheme.com")
+ (synopsis "R6RS Scheme compiler and run-time")
+ (description
+ "Chez Scheme is a compiler and run-time system for the language of the
+Revised^6 Report on Scheme (R6RS), with numerous extensions. The compiler
+generates native code for each target processor, with support for x86, x86_64,
+and 32-bit PowerPC architectures.")
+ (license asl2.0)))
+
(define-public scmutils
(let ()
(define (system-suffix)
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] gnu: Add Chez-Scheme.
2016-05-13 19:03 [PATCH] gnu: Add Chez-Scheme Federico Beffa
@ 2016-05-13 20:44 ` Andreas Enge
2016-05-14 2:51 ` Leo Famulari
0 siblings, 1 reply; 7+ messages in thread
From: Andreas Enge @ 2016-05-13 20:44 UTC (permalink / raw)
To: Federico Beffa; +Cc: Guix-devel
Hi Fede,
just a tiny comment, as I do not have more time right now:
On Fri, May 13, 2016 at 09:03:25PM +0200, Federico Beffa wrote:
> There is no official release yet, so I took a snapshot of the git
> repo. We can switch later.
> +(define-public chez-scheme
> + (package
> + (name "chez-scheme")
> + (version "20160512.41d94b07")
Did we not decide on a convention that was "previous version + git commit",
something like "0.0.0-41d94b07", so that the version numbers will increase
with the next (or first) release and upgrades will be smooth?
Andreas
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] gnu: Add Chez-Scheme.
2016-05-13 20:44 ` Andreas Enge
@ 2016-05-14 2:51 ` Leo Famulari
2016-05-14 7:28 ` Federico Beffa
0 siblings, 1 reply; 7+ messages in thread
From: Leo Famulari @ 2016-05-14 2:51 UTC (permalink / raw)
To: Andreas Enge; +Cc: Guix-devel, Federico Beffa
On Fri, May 13, 2016 at 10:44:28PM +0200, Andreas Enge wrote:
> Hi Fede,
>
> just a tiny comment, as I do not have more time right now:
>
> On Fri, May 13, 2016 at 09:03:25PM +0200, Federico Beffa wrote:
> > There is no official release yet, so I took a snapshot of the git
> > repo. We can switch later.
> > +(define-public chez-scheme
> > + (package
> > + (name "chez-scheme")
> > + (version "20160512.41d94b07")
>
> Did we not decide on a convention that was "previous version + git commit",
> something like "0.0.0-41d94b07", so that the version numbers will increase
> with the next (or first) release and upgrades will be smooth?
Yes, the manual describes it in 7.6.3 Version Numbers:
https://www.gnu.org/software/guix/manual/guix.html#Version-Numbers
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] gnu: Add Chez-Scheme.
2016-05-14 2:51 ` Leo Famulari
@ 2016-05-14 7:28 ` Federico Beffa
2016-05-14 7:55 ` Federico Beffa
0 siblings, 1 reply; 7+ messages in thread
From: Federico Beffa @ 2016-05-14 7:28 UTC (permalink / raw)
To: Leo Famulari; +Cc: Guix-devel
On Sat, May 14, 2016 at 4:51 AM, Leo Famulari <leo@famulari.name> wrote:
> On Fri, May 13, 2016 at 10:44:28PM +0200, Andreas Enge wrote:
>> Hi Fede,
>>
>> just a tiny comment, as I do not have more time right now:
>>
>> On Fri, May 13, 2016 at 09:03:25PM +0200, Federico Beffa wrote:
>> > There is no official release yet, so I took a snapshot of the git
>> > repo. We can switch later.
>> > +(define-public chez-scheme
>> > + (package
>> > + (name "chez-scheme")
>> > + (version "20160512.41d94b07")
>>
>> Did we not decide on a convention that was "previous version + git commit",
>> something like "0.0.0-41d94b07", so that the version numbers will increase
>> with the next (or first) release and upgrades will be smooth?
>
> Yes, the manual describes it in 7.6.3 Version Numbers:
>
> https://www.gnu.org/software/guix/manual/guix.html#Version-Numbers
Officially this is version 9.4 and I suppose the coming release will
have that number. I will then use 9.3-1.41d94b07 so that going to 9.4
will be seen as an upgrade.
Regards,
Fede
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] gnu: Add Chez-Scheme.
2016-05-14 7:28 ` Federico Beffa
@ 2016-05-14 7:55 ` Federico Beffa
2016-05-14 8:31 ` Andreas Enge
2016-05-15 20:04 ` Ludovic Courtès
0 siblings, 2 replies; 7+ messages in thread
From: Federico Beffa @ 2016-05-14 7:55 UTC (permalink / raw)
To: Leo Famulari; +Cc: Guix-devel
On Sat, May 14, 2016 at 9:28 AM, Federico Beffa <beffa@ieee.org> wrote:
> On Sat, May 14, 2016 at 4:51 AM, Leo Famulari <leo@famulari.name> wrote:
>> On Fri, May 13, 2016 at 10:44:28PM +0200, Andreas Enge wrote:
>>> Hi Fede,
>>>
>>> just a tiny comment, as I do not have more time right now:
>>>
>>> On Fri, May 13, 2016 at 09:03:25PM +0200, Federico Beffa wrote:
>>> > There is no official release yet, so I took a snapshot of the git
>>> > repo. We can switch later.
>>> > +(define-public chez-scheme
>>> > + (package
>>> > + (name "chez-scheme")
>>> > + (version "20160512.41d94b07")
>>>
>>> Did we not decide on a convention that was "previous version + git commit",
>>> something like "0.0.0-41d94b07", so that the version numbers will increase
>>> with the next (or first) release and upgrades will be smooth?
>>
>> Yes, the manual describes it in 7.6.3 Version Numbers:
>>
>> https://www.gnu.org/software/guix/manual/guix.html#Version-Numbers
>
> Officially this is version 9.4 and I suppose the coming release will
> have that number. I will then use 9.3-1.41d94b07 so that going to 9.4
> will be seen as an upgrade.
Well, the new release has just appeared :-) So I will switch to it immediately.
Regards,
Fede
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-05-15 20:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-13 19:03 [PATCH] gnu: Add Chez-Scheme Federico Beffa
2016-05-13 20:44 ` Andreas Enge
2016-05-14 2:51 ` Leo Famulari
2016-05-14 7:28 ` Federico Beffa
2016-05-14 7:55 ` Federico Beffa
2016-05-14 8:31 ` Andreas Enge
2016-05-15 20:04 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).