Message ID | CAKrPhPMrokjYGCEjMKtKbuF29cpwUid2HG2uLPuVfRGLbGp4Nw@mail.gmail.com |
---|---|
State | New |
Headers | show |
Federico Beffa <beffa@ieee.org> writes: > From 828438eb009a557cd0be5f0e2a42eebb0d59257d Mon Sep 17 00:00:00 2001 > From: Federico Beffa <beffa@fbengineering.ch> > Date: Sun, 16 Oct 2016 15:59:49 +0200 > Subject: [PATCH 03/15] gnu: Add chez-web > > * gnu/packages/chez.scm (chez-web): New variable. > --- > gnu/packages/chez.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm > index 68591da..d9f6f71 100644 > --- a/gnu/packages/chez.scm > +++ b/gnu/packages/chez.scm > @@ -22,6 +22,7 @@ > #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3 expat)) > #: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) > @@ -222,3 +223,51 @@ and 32-bit PowerPC architectures.") > (description > "This package provides a collection of SRFI libraries for Chez Scheme.") > (license expat))) > + > +(define-public chez-web > + (package > + (name "chez-web") > + ;; release 2.0 is different and doesn't work. Can you expand on this comment? Why does the released version not work? > + (version "2.0-1.5fd177f") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/arcfide/ChezWEB.git") > + (commit "5fd177fe53f31f466bf88720d03c95a3711a8bea"))) > + (file-name (string-append name "-" version "-checkout")) > + (sha256 > + (base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b")))) > + (build-system gnu-build-system) > + (native-inputs > + `(("chez-scheme" ,chez-scheme) > + ("texlive" ,texlive))) > + (arguments > + `(#:make-flags (let ((out (assoc-ref %outputs "out"))) > + (list (string-append "PREFIX=" out) > + (string-append "DOCDIR=" out "/share/doc/" > + ,name "-" ,version) > + (string-append "LIBDIR=" out "/lib/chezweb") > + (string-append "TEXDIR=" out "/share/texmf-local"))) You can use %output instead of (assoc-ref %outputs "out") here. > + #:tests? #f ; no tests > + #:phases > + (modify-phases %standard-phases > + (replace 'configure > + (lambda* _ > + (copy-file "config.mk.template" "config.mk") > + (substitute* "tangleit" > + (("\\./cheztangle\\.ss" all) > + (string-append "chez-scheme --program " all))) > + (substitute* "weaveit" > + (("mpost chezweb\\.mp") > + "mpost --tex=tex chezweb.mp") > + (("\\./chezweave" all) > + (string-append "chez-scheme --program " all))) > + (substitute* "installit" > + (("-g \\$GROUP -o \\$OWNER") ""))))))) > + (home-page "https://github.com/arcfide/ChezWEB") > + (synopsis "Hygienic Literate Programming for Chez Scheme") > + (description "ChezWEB is a system for doing Knuthian style WEB > +programming in Scheme, and more particularly, it is implemented in > +Chez Scheme.") I think the description up to the first comma is enough, since chez scheme is implied by the name.
On Mon, Oct 17, 2016 at 4:43 AM, Marius Bakke <mbakke@fastmail.com> wrote: > Federico Beffa <beffa@ieee.org> writes: > >> From 828438eb009a557cd0be5f0e2a42eebb0d59257d Mon Sep 17 00:00:00 2001 >> From: Federico Beffa <beffa@fbengineering.ch> >> Date: Sun, 16 Oct 2016 15:59:49 +0200 >> Subject: [PATCH 03/15] gnu: Add chez-web >> >> * gnu/packages/chez.scm (chez-web): New variable. >> --- >> gnu/packages/chez.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 49 insertions(+) >> >> diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm >> index 68591da..d9f6f71 100644 >> --- a/gnu/packages/chez.scm >> +++ b/gnu/packages/chez.scm >> @@ -22,6 +22,7 @@ >> #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3 expat)) >> #: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) >> @@ -222,3 +223,51 @@ and 32-bit PowerPC architectures.") >> (description >> "This package provides a collection of SRFI libraries for Chez Scheme.") >> (license expat))) >> + >> +(define-public chez-web >> + (package >> + (name "chez-web") >> + ;; release 2.0 is different and doesn't work. > > Can you expand on this comment? Why does the released version not work? I spent a bunch of time trying to tangle the released WEB file and I was always getting errors (I even contacted the author). At some point I had enough and tried the latest commit and all of a sudden everything was working. > >> + (version "2.0-1.5fd177f") >> + (source >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://github.com/arcfide/ChezWEB.git") >> + (commit "5fd177fe53f31f466bf88720d03c95a3711a8bea"))) >> + (file-name (string-append name "-" version "-checkout")) >> + (sha256 >> + (base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b")))) >> + (build-system gnu-build-system) >> + (native-inputs >> + `(("chez-scheme" ,chez-scheme) >> + ("texlive" ,texlive))) >> + (arguments >> + `(#:make-flags (let ((out (assoc-ref %outputs "out"))) >> + (list (string-append "PREFIX=" out) >> + (string-append "DOCDIR=" out "/share/doc/" >> + ,name "-" ,version) >> + (string-append "LIBDIR=" out "/lib/chezweb") >> + (string-append "TEXDIR=" out "/share/texmf-local"))) > > You can use %output instead of (assoc-ref %outputs "out") here. OK > >> + #:tests? #f ; no tests >> + #:phases >> + (modify-phases %standard-phases >> + (replace 'configure >> + (lambda* _ >> + (copy-file "config.mk.template" "config.mk") >> + (substitute* "tangleit" >> + (("\\./cheztangle\\.ss" all) >> + (string-append "chez-scheme --program " all))) >> + (substitute* "weaveit" >> + (("mpost chezweb\\.mp") >> + "mpost --tex=tex chezweb.mp") >> + (("\\./chezweave" all) >> + (string-append "chez-scheme --program " all))) >> + (substitute* "installit" >> + (("-g \\$GROUP -o \\$OWNER") ""))))))) >> + (home-page "https://github.com/arcfide/ChezWEB") >> + (synopsis "Hygienic Literate Programming for Chez Scheme") >> + (description "ChezWEB is a system for doing Knuthian style WEB >> +programming in Scheme, and more particularly, it is implemented in >> +Chez Scheme.") > > I think the description up to the first comma is enough, since chez > scheme is implied by the name. OK thanks.
From 828438eb009a557cd0be5f0e2a42eebb0d59257d Mon Sep 17 00:00:00 2001 From: Federico Beffa <beffa@fbengineering.ch> Date: Sun, 16 Oct 2016 15:59:49 +0200 Subject: [PATCH 03/15] gnu: Add chez-web * gnu/packages/chez.scm (chez-web): New variable. --- gnu/packages/chez.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 68591da..d9f6f71 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -22,6 +22,7 @@ #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3 expat)) #: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) @@ -222,3 +223,51 @@ and 32-bit PowerPC architectures.") (description "This package provides a collection of SRFI libraries for Chez Scheme.") (license expat))) + +(define-public chez-web + (package + (name "chez-web") + ;; release 2.0 is different and doesn't work. + (version "2.0-1.5fd177f") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arcfide/ChezWEB.git") + (commit "5fd177fe53f31f466bf88720d03c95a3711a8bea"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b")))) + (build-system gnu-build-system) + (native-inputs + `(("chez-scheme" ,chez-scheme) + ("texlive" ,texlive))) + (arguments + `(#:make-flags (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "DOCDIR=" out "/share/doc/" + ,name "-" ,version) + (string-append "LIBDIR=" out "/lib/chezweb") + (string-append "TEXDIR=" out "/share/texmf-local"))) + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* _ + (copy-file "config.mk.template" "config.mk") + (substitute* "tangleit" + (("\\./cheztangle\\.ss" all) + (string-append "chez-scheme --program " all))) + (substitute* "weaveit" + (("mpost chezweb\\.mp") + "mpost --tex=tex chezweb.mp") + (("\\./chezweave" all) + (string-append "chez-scheme --program " all))) + (substitute* "installit" + (("-g \\$GROUP -o \\$OWNER") ""))))))) + (home-page "https://github.com/arcfide/ChezWEB") + (synopsis "Hygienic Literate Programming for Chez Scheme") + (description "ChezWEB is a system for doing Knuthian style WEB +programming in Scheme, and more particularly, it is implemented in +Chez Scheme.") + (license expat))) -- 2.7.4