* [PATCH 1/2] gnu: Add femtolisp. @ 2016-09-13 19:04 ng0 2016-09-13 19:04 ` [PATCH 2/2] gnu: lispf4: Remove unused inputs key ng0 2016-09-13 19:30 ` [PATCH 1/2] gnu: Add femtolisp Ricardo Wurmus 0 siblings, 2 replies; 24+ messages in thread From: ng0 @ 2016-09-13 19:04 UTC (permalink / raw) To: guix-devel * gnu/packages/lisp.scm (femtolisp): New variable. --- gnu/packages/lisp.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8ee249d..4e2ecdb 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -487,3 +487,56 @@ in the early 80's. It was converted to C by Blake McBride and supports much of the InterLisp Standard.") (home-page "https://github.com/blakemcbride/LISPF4.git") (license license:expat)))) + +(define-public femtolisp + (let* ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") + (revision "1")) + (package + (name "femtolisp") + (version (string-append "0.0.0-" revision "-" (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JeffBezanson/femtolisp.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("CC=gcc") + #:tests? #f ; No make check + #:phases + (modify-phases %standard-phases + (delete 'configure) ; No configure script + ;; We have to remove the 'test phase because it requires + ;; the flisp binary to be present. Instead we run + ;; bootstrap.sh after the 'install phase. + (add-before 'build 'patch-makefile + (lambda _ + (substitute* "Makefile" + (("default: release test") "default: release")) + #t)) + (replace 'install ; Makefile has no 'install phase + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "flisp" bin) + #t))) + ;; The flisp binary is now available, run bootstrap to + ;; generate flisp.boot and afterwards runs make test. + (add-after 'install 'bootstrap-gen-and-test + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (and + (zero? (system* "./bootstrap.sh")) + (install-file "flisp.boot" bin)))))))) + (synopsis "Scheme-like lisp implementation") + (description + "@code{femtolisp} is a scheme-like lisp implementation with a +simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. +The core is 12 builtin special forms and 33 builtin functions.") + (home-page "https://github.com/JeffBezanson/femtolisp") + (license license:bsd-3)))) -- 2.10.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 2/2] gnu: lispf4: Remove unused inputs key. 2016-09-13 19:04 [PATCH 1/2] gnu: Add femtolisp ng0 @ 2016-09-13 19:04 ` ng0 2016-09-13 19:30 ` [PATCH 1/2] gnu: Add femtolisp Ricardo Wurmus 1 sibling, 0 replies; 24+ messages in thread From: ng0 @ 2016-09-13 19:04 UTC (permalink / raw) To: guix-devel * gnu/packages/lisp.scm (lispf4)[arguments]: Remove unused inputs from 'install phase. [source](file-name): Append -checkout to the file-name. --- gnu/packages/lisp.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4e2ecdb..c5d8e5c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -453,7 +453,7 @@ interface.") (uri (git-reference (url "https://github.com/blakemcbride/LISPF4.git") (commit commit))) - (file-name (string-append name "-" version)) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "18k8kfn30za637y4bfbm9x3vv4psa3q8f7bi9h4h0qlb8rz8m92c")))) @@ -463,14 +463,12 @@ interface.") (arguments `(#:make-flags '("-f" "Makefile.unx" "CC=gcc") - ;; no check phase - #:tests? #f + #:tests? #f ; No 'check phase #:phases (modify-phases %standard-phases (delete 'configure) - (replace - 'install - (lambda* (#:key outputs inputs #:allow-other-keys) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (doc (string-append (assoc-ref outputs "doc") -- 2.10.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-13 19:04 [PATCH 1/2] gnu: Add femtolisp ng0 2016-09-13 19:04 ` [PATCH 2/2] gnu: lispf4: Remove unused inputs key ng0 @ 2016-09-13 19:30 ` Ricardo Wurmus 2016-09-13 19:45 ` ng0 2016-09-13 20:32 ` ng0 1 sibling, 2 replies; 24+ messages in thread From: Ricardo Wurmus @ 2016-09-13 19:30 UTC (permalink / raw) To: ng0; +Cc: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > * gnu/packages/lisp.scm (femtolisp): New variable. > --- > gnu/packages/lisp.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 53 insertions(+) > > diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm > index 8ee249d..4e2ecdb 100644 > --- a/gnu/packages/lisp.scm > +++ b/gnu/packages/lisp.scm > @@ -487,3 +487,56 @@ in the early 80's. It was converted to C by Blake McBride and supports much of > the InterLisp Standard.") > (home-page "https://github.com/blakemcbride/LISPF4.git") > (license license:expat)))) > + > +(define-public femtolisp > + (let* ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") > + (revision "1")) > + (package > + (name "femtolisp") > + (version (string-append "0.0.0-" revision "-" (string-take commit 7))) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/JeffBezanson/femtolisp.git") > + (commit commit))) > + (file-name (string-append name "-" version "-checkout")) > + (sha256 > + (base32 > + "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) > + (build-system gnu-build-system) > + (arguments > + `(#:make-flags '("CC=gcc") > + #:tests? #f ; No make check But it does have a “test” target, no? How about “#:test-target "test"” instead of disabling the tests? > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) ; No configure script > + ;; We have to remove the 'test phase because it requires > + ;; the flisp binary to be present. Instead we run > + ;; bootstrap.sh after the 'install phase. I find this strange. More about this below. > + (add-before 'build 'patch-makefile > + (lambda _ > + (substitute* "Makefile" > + (("default: release test") "default: release")) > + #t)) This may not be necessary when you pass “release” as one of the “#:make-flags”. > + (replace 'install ; Makefile has no 'install phase > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin"))) > + (install-file "flisp" bin) > + #t))) > + ;; The flisp binary is now available, run bootstrap to > + ;; generate flisp.boot and afterwards runs make test. > + (add-after 'install 'bootstrap-gen-and-test > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin"))) > + (and > + (zero? (system* "./bootstrap.sh")) > + (install-file "flisp.boot" bin)))))))) “install-file” has an unspecified return value. I’m a little surprised to see “bootstrap.sh” to be used *after* installation. That’s very odd. Could the tests not be fixed in another way, e.g. by overriding the location of the binary? > + (synopsis "Scheme-like lisp implementation") > + (description > + "@code{femtolisp} is a scheme-like lisp implementation with a > +simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. > +The core is 12 builtin special forms and 33 builtin functions.") “Scheme-like”. I think the sentence on “lisp-1” can be removed, because if it’s Scheme-like it’s unlikely to be a lisp-2. > + (home-page "https://github.com/JeffBezanson/femtolisp") > + (license license:bsd-3)))) ~~ Ricardo ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-13 19:30 ` [PATCH 1/2] gnu: Add femtolisp Ricardo Wurmus @ 2016-09-13 19:45 ` ng0 2016-09-13 20:32 ` ng0 1 sibling, 0 replies; 24+ messages in thread From: ng0 @ 2016-09-13 19:45 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel Hi, thanks for reviewing Ricardo Wurmus <rekado@elephly.net> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> * gnu/packages/lisp.scm (femtolisp): New variable. >> --- >> gnu/packages/lisp.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 53 insertions(+) >> >> diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm >> index 8ee249d..4e2ecdb 100644 >> --- a/gnu/packages/lisp.scm >> +++ b/gnu/packages/lisp.scm >> @@ -487,3 +487,56 @@ in the early 80's. It was converted to C by Blake McBride and supports much of >> the InterLisp Standard.") >> (home-page "https://github.com/blakemcbride/LISPF4.git") >> (license license:expat)))) >> + >> +(define-public femtolisp >> + (let* ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") >> + (revision "1")) >> + (package >> + (name "femtolisp") >> + (version (string-append "0.0.0-" revision "-" (string-take commit 7))) >> + (source (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://github.com/JeffBezanson/femtolisp.git") >> + (commit commit))) >> + (file-name (string-append name "-" version "-checkout")) >> + (sha256 >> + (base32 >> + "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) >> + (build-system gnu-build-system) >> + (arguments >> + `(#:make-flags '("CC=gcc") >> + #:tests? #f ; No make check > > But it does have a “test” target, no? How about “#:test-target "test"” > instead of disabling the tests? Ah ... sorry, I'll fix it again. I've seen this, but I've also worked on 40 other packages meanwhile. >> + #:phases >> + (modify-phases %standard-phases >> + (delete 'configure) ; No configure script >> + ;; We have to remove the 'test phase because it requires >> + ;; the flisp binary to be present. Instead we run >> + ;; bootstrap.sh after the 'install phase. > > I find this strange. More about this below. > >> + (add-before 'build 'patch-makefile >> + (lambda _ >> + (substitute* "Makefile" >> + (("default: release test") "default: release")) >> + #t)) > > This may not be necessary when you pass “release” as one of the > “#:make-flags”. I try it, maybe it works. >> + (replace 'install ; Makefile has no 'install phase >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin"))) >> + (install-file "flisp" bin) >> + #t))) >> + ;; The flisp binary is now available, run bootstrap to >> + ;; generate flisp.boot and afterwards runs make test. >> + (add-after 'install 'bootstrap-gen-and-test >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin"))) >> + (and >> + (zero? (system* "./bootstrap.sh")) >> + (install-file "flisp.boot" bin)))))))) > > “install-file” has an unspecified return value. I’m a little surprised > to see “bootstrap.sh” to be used *after* installation. That’s very odd. > Could the tests not be fixed in another way, e.g. by overriding the > location of the binary? Okay, so I change it back to what this was before, without (and)? On fixing it differently: No. If you can come up with a way to fix it afterwards, you're welcome to fix it, I can't do this at the moment. >> + (synopsis "Scheme-like lisp implementation") >> + (description >> + "@code{femtolisp} is a scheme-like lisp implementation with a >> +simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. >> +The core is 12 builtin special forms and 33 builtin functions.") > > > “Scheme-like”. I think the sentence on “lisp-1” can be removed, because > if it’s Scheme-like it’s unlikely to be a lisp-2. Okay, I don't know enough about scheme and lisp to comment that so I'll just change it. >> + (home-page "https://github.com/JeffBezanson/femtolisp") >> + (license license:bsd-3)))) > > ~~ Ricardo > > -- ng0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-13 19:30 ` [PATCH 1/2] gnu: Add femtolisp Ricardo Wurmus 2016-09-13 19:45 ` ng0 @ 2016-09-13 20:32 ` ng0 2016-09-14 9:00 ` Ricardo Wurmus 1 sibling, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-13 20:32 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel [-- Attachment #1.1: Type: text/plain, Size: 4098 bytes --] I hope the appended patch still applies. Ricardo Wurmus <rekado@elephly.net> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> * gnu/packages/lisp.scm (femtolisp): New variable. >> --- >> gnu/packages/lisp.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 53 insertions(+) >> >> diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm >> index 8ee249d..4e2ecdb 100644 >> --- a/gnu/packages/lisp.scm >> +++ b/gnu/packages/lisp.scm >> @@ -487,3 +487,56 @@ in the early 80's. It was converted to C by Blake McBride and supports much of >> the InterLisp Standard.") >> (home-page "https://github.com/blakemcbride/LISPF4.git") >> (license license:expat)))) >> + >> +(define-public femtolisp >> + (let* ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") >> + (revision "1")) >> + (package >> + (name "femtolisp") >> + (version (string-append "0.0.0-" revision "-" (string-take commit 7))) >> + (source (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://github.com/JeffBezanson/femtolisp.git") >> + (commit commit))) >> + (file-name (string-append name "-" version "-checkout")) >> + (sha256 >> + (base32 >> + "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) >> + (build-system gnu-build-system) >> + (arguments >> + `(#:make-flags '("CC=gcc") >> + #:tests? #f ; No make check > > But it does have a “test” target, no? How about “#:test-target "test"” > instead of disabling the tests? > >> + #:phases >> + (modify-phases %standard-phases >> + (delete 'configure) ; No configure script >> + ;; We have to remove the 'test phase because it requires >> + ;; the flisp binary to be present. Instead we run >> + ;; bootstrap.sh after the 'install phase. > > I find this strange. More about this below. > >> + (add-before 'build 'patch-makefile >> + (lambda _ >> + (substitute* "Makefile" >> + (("default: release test") "default: release")) >> + #t)) > > This may not be necessary when you pass “release” as one of the > “#:make-flags”. > >> + (replace 'install ; Makefile has no 'install phase >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin"))) >> + (install-file "flisp" bin) >> + #t))) >> + ;; The flisp binary is now available, run bootstrap to >> + ;; generate flisp.boot and afterwards runs make test. >> + (add-after 'install 'bootstrap-gen-and-test >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin"))) >> + (and >> + (zero? (system* "./bootstrap.sh")) >> + (install-file "flisp.boot" bin)))))))) > > “install-file” has an unspecified return value. I’m a little surprised > to see “bootstrap.sh” to be used *after* installation. That’s very odd. > Could the tests not be fixed in another way, e.g. by overriding the > location of the binary? > >> + (synopsis "Scheme-like lisp implementation") >> + (description >> + "@code{femtolisp} is a scheme-like lisp implementation with a >> +simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. >> +The core is 12 builtin special forms and 33 builtin functions.") > > > “Scheme-like”. I think the sentence on “lisp-1” can be removed, because > if it’s Scheme-like it’s unlikely to be a lisp-2. > >> + (home-page "https://github.com/JeffBezanson/femtolisp") >> + (license license:bsd-3)))) > > ~~ Ricardo > > [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.2: 0001-gnu-femtolisp-Adjust-description.patch --] [-- Type: text/x-patch, Size: 2768 bytes --] From d4190191c58c454a4bcd626bf8009bcea896f2ae Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Tue, 13 Sep 2016 20:19:57 +0000 Subject: [PATCH] gnu: femtolisp: Adjust description. * gnu/packages/lisp.scm (femtolisp)[description]: Adjust to remove unnecessary sentence. [arguments](patch-makefile): Remove it and ... (make-flags): Add "release" to make-flags. (arguments)[tests]: Enable them as test-target "test". --- gnu/packages/lisp.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3461de4..2816315 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -503,25 +503,16 @@ the InterLisp Standard.") "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") - #:tests? #f ; No make check + `(#:make-flags '("CC=gcc" "release") + #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) ; No configure script - ;; We have to remove the 'test phase because it requires - ;; the flisp binary to be present. Instead we run - ;; bootstrap.sh after the 'install phase. - (add-before 'build 'patch-makefile - (lambda _ - (substitute* "Makefile" - (("default: release test") "default: release")) - #t)) (replace 'install ; Makefile has no 'install phase (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (install-file "flisp" bin) - #t))) + (install-file "flisp" bin)))) ;; The flisp binary is now available, run bootstrap to ;; generate flisp.boot and afterwards runs make test. (add-after 'install 'bootstrap-gen-and-test @@ -533,8 +524,8 @@ the InterLisp Standard.") (install-file "flisp.boot" bin)))))))) (synopsis "Scheme-like lisp implementation") (description - "@code{femtolisp} is a scheme-like lisp implementation with a -simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. -The core is 12 builtin special forms and 33 builtin functions.") + "@code{femtolisp} is a Scheme-like lisp implementation with a +simple, elegant Scheme dialect. The core is 12 builtin special forms +and 33 builtin functions.") (home-page "https://github.com/JeffBezanson/femtolisp") (license license:bsd-3)))) -- 2.10.0 [-- Attachment #1.3: Type: text/plain, Size: 28 bytes --] -- ng0 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-13 20:32 ` ng0 @ 2016-09-14 9:00 ` Ricardo Wurmus 2016-09-14 9:31 ` ng0 0 siblings, 1 reply; 24+ messages in thread From: Ricardo Wurmus @ 2016-09-14 9:00 UTC (permalink / raw) To: ng0; +Cc: guix-devel Hi, > I hope the appended patch still applies. could you please send a new, complete patch? You seem to have removed the “#t” from the “install” phase accidentally. The return value should be kept. ~~ Ricardo ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 9:00 ` Ricardo Wurmus @ 2016-09-14 9:31 ` ng0 2016-09-14 9:48 ` ng0 0 siblings, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-14 9:31 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel [-- Attachment #1.1: Type: text/plain, Size: 300 bytes --] Ricardo Wurmus <rekado@elephly.net> writes: > Hi, > >> I hope the appended patch still applies. > > could you please send a new, complete patch? > > You seem to have removed the “#t” from the “install” phase > accidentally. The return value should be kept. > > ~~ Ricardo > > [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.2: 0001-gnu-femtolisp-Adjust-description.patch --] [-- Type: text/x-patch, Size: 2399 bytes --] From 7a58278178f7c13b1c9bfc93da4e5c8d765e59a8 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Tue, 13 Sep 2016 20:19:57 +0000 Subject: [PATCH] gnu: femtolisp: Adjust description. * gnu/packages/lisp.scm (femtolisp)[description]: Adjust to remove unnecessary sentence. [arguments](patch-makefile): Remove it and ... (make-flags): Add "release" to make-flags. (arguments)[tests]: Enable them as test-target "test". --- gnu/packages/lisp.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3461de4..eb72b96 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -503,19 +503,11 @@ the InterLisp Standard.") "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") - #:tests? #f ; No make check + `(#:make-flags '("CC=gcc" "release") + #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) ; No configure script - ;; We have to remove the 'test phase because it requires - ;; the flisp binary to be present. Instead we run - ;; bootstrap.sh after the 'install phase. - (add-before 'build 'patch-makefile - (lambda _ - (substitute* "Makefile" - (("default: release test") "default: release")) - #t)) (replace 'install ; Makefile has no 'install phase (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -533,8 +525,8 @@ the InterLisp Standard.") (install-file "flisp.boot" bin)))))))) (synopsis "Scheme-like lisp implementation") (description - "@code{femtolisp} is a scheme-like lisp implementation with a -simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. -The core is 12 builtin special forms and 33 builtin functions.") + "@code{femtolisp} is a Scheme-like lisp implementation with a +simple, elegant Scheme dialect. The core is 12 builtin special forms +and 33 builtin functions.") (home-page "https://github.com/JeffBezanson/femtolisp") (license license:bsd-3)))) -- 2.10.0 [-- Attachment #1.3: Type: text/plain, Size: 26 bytes --] -- ng0 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 9:31 ` ng0 @ 2016-09-14 9:48 ` ng0 2016-09-14 10:03 ` Ricardo Wurmus 0 siblings, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-14 9:48 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 452 bytes --] ng0 <ng0@we.make.ritual.n0.is> writes: > [ Unknown signature status ] > Ricardo Wurmus <rekado@elephly.net> writes: > >> Hi, >> >>> I hope the appended patch still applies. >> >> could you please send a new, complete patch? >> >> You seem to have removed the “#t” from the “install” phase >> accidentally. The return value should be kept. >> >> ~~ Ricardo Sorry, I'm not sure if I had sent the updated patch or not. The change is so small. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-femtolisp-Adjust-description.patch --] [-- Type: text/x-patch, Size: 2344 bytes --] From 7a58278178f7c13b1c9bfc93da4e5c8d765e59a8 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Tue, 13 Sep 2016 20:19:57 +0000 Subject: [PATCH] gnu: femtolisp: Adjust description. * gnu/packages/lisp.scm (femtolisp)[description]: Adjust to remove unnecessary sentence. [arguments](patch-makefile): Remove it and ... (make-flags): Add "release" to make-flags. (arguments)[tests]: Enable them as test-target "test". --- gnu/packages/lisp.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3461de4..eb72b96 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -503,19 +503,11 @@ the InterLisp Standard.") "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") - #:tests? #f ; No make check + `(#:make-flags '("CC=gcc" "release") + #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) ; No configure script - ;; We have to remove the 'test phase because it requires - ;; the flisp binary to be present. Instead we run - ;; bootstrap.sh after the 'install phase. - (add-before 'build 'patch-makefile - (lambda _ - (substitute* "Makefile" - (("default: release test") "default: release")) - #t)) (replace 'install ; Makefile has no 'install phase (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -533,8 +525,8 @@ the InterLisp Standard.") (install-file "flisp.boot" bin)))))))) (synopsis "Scheme-like lisp implementation") (description - "@code{femtolisp} is a scheme-like lisp implementation with a -simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. -The core is 12 builtin special forms and 33 builtin functions.") + "@code{femtolisp} is a Scheme-like lisp implementation with a +simple, elegant Scheme dialect. The core is 12 builtin special forms +and 33 builtin functions.") (home-page "https://github.com/JeffBezanson/femtolisp") (license license:bsd-3)))) -- 2.10.0 [-- Attachment #3: Type: text/plain, Size: 24 bytes --] -- ng0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 9:48 ` ng0 @ 2016-09-14 10:03 ` Ricardo Wurmus 2016-09-14 10:15 ` ng0 0 siblings, 1 reply; 24+ messages in thread From: Ricardo Wurmus @ 2016-09-14 10:03 UTC (permalink / raw) To: ng0; +Cc: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> [ Unknown signature status ] >> Ricardo Wurmus <rekado@elephly.net> writes: >> >>> Hi, >>> >>>> I hope the appended patch still applies. >>> >>> could you please send a new, complete patch? >>> >>> You seem to have removed the “#t” from the “install” phase >>> accidentally. The return value should be kept. >>> >>> ~~ Ricardo > > Sorry, I'm not sure if I had sent the updated patch or not. The change > is so small. I’m sorry for the confusion. Looking at the subject of these emails I assumed that this patch was supposed to *add* a *new* package, not modify an existing one. I didn’t know that an earlier version had already been pushed. In this case we should probably split these changes up as they are not related to one another. Alternatively, the summary line should be changed to apply to all of the changes in this patch. ~~ Ricardo ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 10:03 ` Ricardo Wurmus @ 2016-09-14 10:15 ` ng0 2016-09-14 11:05 ` Ricardo Wurmus 0 siblings, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-14 10:15 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel Ricardo Wurmus <rekado@elephly.net> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> ng0 <ng0@we.make.ritual.n0.is> writes: >> >>> [ Unknown signature status ] >>> Ricardo Wurmus <rekado@elephly.net> writes: >>> >>>> Hi, >>>> >>>>> I hope the appended patch still applies. >>>> >>>> could you please send a new, complete patch? >>>> >>>> You seem to have removed the “#t” from the “install” phase >>>> accidentally. The return value should be kept. >>>> >>>> ~~ Ricardo >> >> Sorry, I'm not sure if I had sent the updated patch or not. The change >> is so small. > > I’m sorry for the confusion. Looking at the subject of these emails I > assumed that this patch was supposed to *add* a *new* package, not > modify an existing one. I didn’t know that an earlier version had > already been pushed. No problem. > In this case we should probably split these changes up as they are not > related to one another. Alternatively, the summary line should be > changed to apply to all of the changes in this patch. Can you give me an example how the summary line should look like then? > ~~ Ricardo > > -- ng0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 10:15 ` ng0 @ 2016-09-14 11:05 ` Ricardo Wurmus 2016-09-14 11:17 ` ng0 0 siblings, 1 reply; 24+ messages in thread From: Ricardo Wurmus @ 2016-09-14 11:05 UTC (permalink / raw) To: ng0; +Cc: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > Ricardo Wurmus <rekado@elephly.net> writes: >> In this case we should probably split these changes up as they are not >> related to one another. Alternatively, the summary line should be >> changed to apply to all of the changes in this patch. > > Can you give me an example how the summary line should look like then? I just checked the git log but couldn’t find a similar package in which changes of this magnitude were summarised in one commit. I suggest splitting this up. Actually, though, I think the description doesn’t need changing. I only suggested removing the sentence because I assumed that the package didn’t yet exist. There’s no harm in keeping it. Without the description change it’s really just one thing that has been changed: gnu: femtolisp: Remove custom "patch-makefile" phase. * gnu/packages/lisp.scm (femtolisp)[arguments]: Remove "patch-makefile" phase; specify test target; build "release" target instead of "default". What do you think? ~~ Ricardo ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 11:05 ` Ricardo Wurmus @ 2016-09-14 11:17 ` ng0 2016-09-14 12:03 ` ng0 0 siblings, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-14 11:17 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel Ricardo Wurmus <rekado@elephly.net> writes: > ng0 <ng0@we.make.ritual.n0.is> writes: > >> Ricardo Wurmus <rekado@elephly.net> writes: >>> In this case we should probably split these changes up as they are not >>> related to one another. Alternatively, the summary line should be >>> changed to apply to all of the changes in this patch. >> >> Can you give me an example how the summary line should look like then? > > I just checked the git log but couldn’t find a similar package in which > changes of this magnitude were summarised in one commit. > > I suggest splitting this up. Actually, though, I think the description > doesn’t need changing. I only suggested removing the sentence because I > assumed that the package didn’t yet exist. There’s no harm in keeping > it. > > Without the description change it’s really just one thing that has been > changed: Ah, you are right. > gnu: femtolisp: Remove custom "patch-makefile" phase. > > * gnu/packages/lisp.scm (femtolisp)[arguments]: Remove > "patch-makefile" phase; specify test target; build "release" > target instead of "default". > > What do you think? > > ~~ Ricardo > > I will send an updated patch in one or two hours, thanks. -- ng0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 11:17 ` ng0 @ 2016-09-14 12:03 ` ng0 2016-09-18 10:02 ` Andreas Enge ` (2 more replies) 0 siblings, 3 replies; 24+ messages in thread From: ng0 @ 2016-09-14 12:03 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.1: 0001-gnu-femtolisp-Remove-custom-patch-makefile-phase.patch --] [-- Type: text/x-patch, Size: 2185 bytes --] From 4061b7fb71a40591dd8e34ee147153aa0d1d9fdc Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Tue, 13 Sep 2016 20:19:57 +0000 Subject: [PATCH] gnu: femtolisp: Remove custom "patch-makefile" phase. * gnu/packages/lisp.scm (femtolisp)[arguments]: Remove "patch-makefile" phase; specify test target; build "release" target instead of "default". --- gnu/packages/lisp.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3461de4..c7b8f35 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -503,19 +503,11 @@ the InterLisp Standard.") "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") - #:tests? #f ; No make check + `(#:make-flags '("CC=gcc" "release") + #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) ; No configure script - ;; We have to remove the 'test phase because it requires - ;; the flisp binary to be present. Instead we run - ;; bootstrap.sh after the 'install phase. - (add-before 'build 'patch-makefile - (lambda _ - (substitute* "Makefile" - (("default: release test") "default: release")) - #t)) (replace 'install ; Makefile has no 'install phase (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -533,7 +525,7 @@ the InterLisp Standard.") (install-file "flisp.boot" bin)))))))) (synopsis "Scheme-like lisp implementation") (description - "@code{femtolisp} is a scheme-like lisp implementation with a + "@code{femtolisp} is a Scheme-like lisp implementation with a simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. The core is 12 builtin special forms and 33 builtin functions.") (home-page "https://github.com/JeffBezanson/femtolisp") -- 2.10.0 [-- Attachment #1.2: Type: text/plain, Size: 28 bytes --] -- ng0 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 12:03 ` ng0 @ 2016-09-18 10:02 ` Andreas Enge 2016-09-20 6:14 ` Ludovic Courtès 2016-09-18 12:20 ` [PATCH 1/2] gnu: Add femtolisp ng0 2016-09-18 12:25 ` ng0 2 siblings, 1 reply; 24+ messages in thread From: Andreas Enge @ 2016-09-18 10:02 UTC (permalink / raw) To: ng0; +Cc: guix-devel Hello, femtolisp fails on mips and arm: http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload with the message In file included from llt/llt.h:6:0, from string.c:16: llt/utils.h:27:4: error: #error "unknown architecture" # error "unknown architecture" Should it be disabled there? Andreas ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-18 10:02 ` Andreas Enge @ 2016-09-20 6:14 ` Ludovic Courtès 2016-09-21 10:37 ` ng0 2016-09-22 9:11 ` [PATCH] gnu: femtolisp: Remove support for mips and armhf ng0 0 siblings, 2 replies; 24+ messages in thread From: Ludovic Courtès @ 2016-09-20 6:14 UTC (permalink / raw) To: Andreas Enge; +Cc: guix-devel Andreas Enge <andreas@enge.fr> skribis: > femtolisp fails on mips and arm: > http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload > with the message > In file included from llt/llt.h:6:0, > from string.c:16: > llt/utils.h:27:4: error: #error "unknown architecture" > # error "unknown architecture" > > Should it be disabled there? Definitely. It would be worth checking in that file the set of supported architectures, and putting them in ‘supported-platforms’. Ludo’. ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-20 6:14 ` Ludovic Courtès @ 2016-09-21 10:37 ` ng0 2016-09-21 15:33 ` Ludovic Courtès 2016-09-22 9:11 ` [PATCH] gnu: femtolisp: Remove support for mips and armhf ng0 1 sibling, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-21 10:37 UTC (permalink / raw) To: Ludovic Courtès, Andreas Enge; +Cc: guix-devel Ludovic Courtès <ludo@gnu.org> writes: > Andreas Enge <andreas@enge.fr> skribis: > >> femtolisp fails on mips and arm: >> http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload >> with the message >> In file included from llt/llt.h:6:0, >> from string.c:16: >> llt/utils.h:27:4: error: #error "unknown architecture" >> # error "unknown architecture" >> >> Should it be disabled there? > > Definitely. It would be worth checking in that file the set of > supported architectures, and putting them in ‘supported-platforms’. > > Ludo’. > Okay, I will fix it. In the meantime should the additional patch which is unrelated to this change be applied. -- ng0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-21 10:37 ` ng0 @ 2016-09-21 15:33 ` Ludovic Courtès 2016-09-21 19:30 ` Ricardo Wurmus 0 siblings, 1 reply; 24+ messages in thread From: Ludovic Courtès @ 2016-09-21 15:33 UTC (permalink / raw) To: ng0; +Cc: guix-devel ng0 <ngillmann@runbox.com> skribis: > Ludovic Courtès <ludo@gnu.org> writes: > >> Andreas Enge <andreas@enge.fr> skribis: >> >>> femtolisp fails on mips and arm: >>> http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload >>> with the message >>> In file included from llt/llt.h:6:0, >>> from string.c:16: >>> llt/utils.h:27:4: error: #error "unknown architecture" >>> # error "unknown architecture" >>> >>> Should it be disabled there? >> >> Definitely. It would be worth checking in that file the set of >> supported architectures, and putting them in ‘supported-platforms’. >> >> Ludo’. >> > > Okay, I will fix it. In the meantime should the additional patch which > is unrelated to this change be applied. Sorry, I’ll let whoever reviewed reply. :-) Ludo’. ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-21 15:33 ` Ludovic Courtès @ 2016-09-21 19:30 ` Ricardo Wurmus 0 siblings, 0 replies; 24+ messages in thread From: Ricardo Wurmus @ 2016-09-21 19:30 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel Ludovic Courtès <ludo@gnu.org> writes: > ng0 <ngillmann@runbox.com> skribis: […] >> Okay, I will fix it. In the meantime should the additional patch which >> is unrelated to this change be applied. > > Sorry, I’ll let whoever reviewed reply. :-) That would be me :) I pushed the patch to remove the custom build phase. It’s in master as f7fe5f7a3e26676657265e98073b9914baf615f1. ~~ Ricardo ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] gnu: femtolisp: Remove support for mips and armhf. 2016-09-20 6:14 ` Ludovic Courtès 2016-09-21 10:37 ` ng0 @ 2016-09-22 9:11 ` ng0 2016-09-26 10:38 ` Ludovic Courtès 1 sibling, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-22 9:11 UTC (permalink / raw) To: Ludovic Courtès, Andreas Enge; +Cc: guix-devel [-- Attachment #1.1: Type: text/plain, Size: 686 bytes --] Ludovic Courtès <ludo@gnu.org> writes: > Andreas Enge <andreas@enge.fr> skribis: > >> femtolisp fails on mips and arm: >> http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload >> with the message >> In file included from llt/llt.h:6:0, >> from string.c:16: >> llt/utils.h:27:4: error: #error "unknown architecture" >> # error "unknown architecture" >> >> Should it be disabled there? > > Definitely. It would be worth checking in that file the set of > supported architectures, and putting them in ‘supported-platforms’. I'm not exactly sure what's supported, I found win32, osx, freebsd, openbsd, and that's it. > Ludo’. > [-- Attachment #1.2: 0001-gnu-femtolisp-Remove-support-for-mips-and-armhf.patch --] [-- Type: text/x-patch, Size: 1598 bytes --] From 6761e9ae928b590ea18f525cf941e06094fc12d1 Mon Sep 17 00:00:00 2001 From: ng0 <ngillmann@runbox.com> Date: Thu, 22 Sep 2016 09:08:03 +0000 Subject: [PATCH] gnu: femtolisp: Remove support for mips and armhf. * gnu/packages/lisp.scm (femtolisp)[supported-systems]: New field, remove support for mips64el and armhf. --- gnu/packages/lisp.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d1180a7..1b72fe2 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> +;;; Copyright © 2016 ng0 <ngillmann@runbox.com> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; ;;; This file is part of GNU Guix. @@ -501,6 +501,13 @@ the InterLisp Standard.") (sha256 (base32 "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) + ;; armhf and mips64el fail to build, it has been reported upstream: + ;; https://github.com/JeffBezanson/femtolisp/issues/25 + (supported-systems + (and + (delete "armhf-linux" %supported-systems) + (delete "mips64el-linux" %supported-systems) + #t)) (build-system gnu-build-system) (arguments `(#:make-flags '("CC=gcc" "release") -- 2.10.0 [-- Attachment #1.3: Type: text/plain, Size: 26 bytes --] -- ng0 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH] gnu: femtolisp: Remove support for mips and armhf. 2016-09-22 9:11 ` [PATCH] gnu: femtolisp: Remove support for mips and armhf ng0 @ 2016-09-26 10:38 ` Ludovic Courtès 2016-09-27 8:13 ` ng0 0 siblings, 1 reply; 24+ messages in thread From: Ludovic Courtès @ 2016-09-26 10:38 UTC (permalink / raw) To: ng0; +Cc: guix-devel ng0 <ngillmann@runbox.com> skribis: > Ludovic Courtès <ludo@gnu.org> writes: > >> Andreas Enge <andreas@enge.fr> skribis: >> >>> femtolisp fails on mips and arm: >>> http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload >>> with the message >>> In file included from llt/llt.h:6:0, >>> from string.c:16: >>> llt/utils.h:27:4: error: #error "unknown architecture" >>> # error "unknown architecture" >>> >>> Should it be disabled there? >> >> Definitely. It would be worth checking in that file the set of >> supported architectures, and putting them in ‘supported-platforms’. > > I'm not exactly sure what's supported, I found win32, osx, freebsd, > openbsd, and that's it. Sorry, I really meant supported architectures, which is what utils.h seems to be about (although I don’t have the source here to check). Could you check the #ifdefs in there? > + ;; armhf and mips64el fail to build, it has been reported upstream: > + ;; https://github.com/JeffBezanson/femtolisp/issues/25 > + (supported-systems > + (and > + (delete "armhf-linux" %supported-systems) > + (delete "mips64el-linux" %supported-systems) > + #t)) ‘supported-systems’ must be a list of strings, so: (fold delete %supported-systems '("armhf-linux" "mips64el-linux")) Thanks, Ludo’. ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] gnu: femtolisp: Remove support for mips and armhf. 2016-09-26 10:38 ` Ludovic Courtès @ 2016-09-27 8:13 ` ng0 2016-09-27 16:30 ` Leo Famulari 0 siblings, 1 reply; 24+ messages in thread From: ng0 @ 2016-09-27 8:13 UTC (permalink / raw) To: guix-devel [-- Attachment #1.1: Type: text/plain, Size: 2143 bytes --] Ludovic Courtès <ludo@gnu.org> writes: > ng0 <ngillmann@runbox.com> skribis: > >> Ludovic Courtès <ludo@gnu.org> writes: >> >>> Andreas Enge <andreas@enge.fr> skribis: >>> >>>> femtolisp fails on mips and arm: >>>> http://hydra.gnu.org:3000/build/1472987/nixlog/2/tail-reload >>>> with the message >>>> In file included from llt/llt.h:6:0, >>>> from string.c:16: >>>> llt/utils.h:27:4: error: #error "unknown architecture" >>>> # error "unknown architecture" >>>> >>>> Should it be disabled there? >>> >>> Definitely. It would be worth checking in that file the set of >>> supported architectures, and putting them in ‘supported-platforms’. >> >> I'm not exactly sure what's supported, I found win32, osx, freebsd, >> openbsd, and that's it. > > Sorry, I really meant supported architectures, which is what utils.h > seems to be about (although I don’t have the source here to check). > Could you check the #ifdefs in there? #if defined( __amd64__ ) || defined( _M_AMD64 ) # define ARCH_X86_64 # define __CPU__ 686 #elif defined( _M_IX86 )//msvs, intel, digital mars, watcom # if ! defined( __386__ ) # error "unsupported target: 16-bit x86" # endif # define ARCH_X86 # define __CPU__ ( _M_IX86 + 86 ) #elif defined( __i686__ )//gnu c # define ARCH_X86 # define __CPU__ 686 #elif defined( __i586__ )//gnu c # define ARCH_X86 # define __CPU__ 586 #elif defined( __i486__ )//gnu c # define ARCH_X86 # define __CPU__ 486 #elif defined( __i386__ )//gnu c # define ARCH_X86 # define __CPU__ 386 #else # error "unknown architecture" #endif >> + ;; armhf and mips64el fail to build, it has been reported upstream: >> + ;; https://github.com/JeffBezanson/femtolisp/issues/25 >> + (supported-systems >> + (and >> + (delete "armhf-linux" %supported-systems) >> + (delete "mips64el-linux" %supported-systems) >> + #t)) > > ‘supported-systems’ must be a list of strings, so: > > (fold delete %supported-systems > '("armhf-linux" "mips64el-linux")) > > Thanks, > Ludo’. > [-- Attachment #1.2: 0001-gnu-femtolisp-Remove-support-for-mips-and-armhf.patch --] [-- Type: text/x-patch, Size: 1812 bytes --] From 32c4d64ada9ab2573a00385b15b2b0a03a6fa44f Mon Sep 17 00:00:00 2001 From: ng0 <ngillmann@runbox.com> Date: Thu, 22 Sep 2016 09:08:03 +0000 Subject: [PATCH] gnu: femtolisp: Remove support for mips and armhf. * gnu/packages/lisp.scm (femtolisp)[supported-systems]: New field, remove support for mips64el and armhf. --- gnu/packages/lisp.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d1180a7..439433a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> +;;; Copyright © 2016 ng0 <ngillmann@runbox.com> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; ;;; This file is part of GNU Guix. @@ -44,7 +44,8 @@ #:use-module (gnu packages ed) #:use-module (gnu packages m4) #:use-module (gnu packages version-control) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1)) (define-public gcl (package @@ -501,6 +502,11 @@ the InterLisp Standard.") (sha256 (base32 "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) + ;; See "utils.h" for supported systems. Upstream bug: + ;; https://github.com/JeffBezanson/femtolisp/issues/25 + (supported-systems + (fold delete %supported-systems + '("armhf-linux" "mips64el-linux"))) (build-system gnu-build-system) (arguments `(#:make-flags '("CC=gcc" "release") -- 2.10.0 [-- Attachment #1.3: Type: text/plain, Size: 26 bytes --] -- ng0 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH] gnu: femtolisp: Remove support for mips and armhf. 2016-09-27 8:13 ` ng0 @ 2016-09-27 16:30 ` Leo Famulari 0 siblings, 0 replies; 24+ messages in thread From: Leo Famulari @ 2016-09-27 16:30 UTC (permalink / raw) To: ng0; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 260 bytes --] On Tue, Sep 27, 2016 at 08:13:53AM +0000, ng0 wrote: > Subject: [PATCH] gnu: femtolisp: Remove support for mips and armhf. > > * gnu/packages/lisp.scm (femtolisp)[supported-systems]: New field, > remove support for mips64el and armhf. Thanks, pushed! [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 12:03 ` ng0 2016-09-18 10:02 ` Andreas Enge @ 2016-09-18 12:20 ` ng0 2016-09-18 12:25 ` ng0 2 siblings, 0 replies; 24+ messages in thread From: ng0 @ 2016-09-18 12:20 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel ng0 <ng0@we.make.ritual.n0.is> writes: > [ Unknown signature status ] > From 4061b7fb71a40591dd8e34ee147153aa0d1d9fdc Mon Sep 17 00:00:00 2001 > From: ng0 <ng0@we.make.ritual.n0.is> > Date: Tue, 13 Sep 2016 20:19:57 +0000 > Subject: [PATCH] gnu: femtolisp: Remove custom "patch-makefile" phase. > > * gnu/packages/lisp.scm (femtolisp)[arguments]: Remove > "patch-makefile" phase; specify test target; build "release" > target instead of "default". > --- > gnu/packages/lisp.scm | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm > index 3461de4..c7b8f35 100644 > --- a/gnu/packages/lisp.scm > +++ b/gnu/packages/lisp.scm > @@ -503,19 +503,11 @@ the InterLisp Standard.") > "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) > (build-system gnu-build-system) > (arguments > - `(#:make-flags '("CC=gcc") > - #:tests? #f ; No make check > + `(#:make-flags '("CC=gcc" "release") > + #:test-target "test" > #:phases > (modify-phases %standard-phases > (delete 'configure) ; No configure script > - ;; We have to remove the 'test phase because it requires > - ;; the flisp binary to be present. Instead we run > - ;; bootstrap.sh after the 'install phase. > - (add-before 'build 'patch-makefile > - (lambda _ > - (substitute* "Makefile" > - (("default: release test") "default: release")) > - #t)) > (replace 'install ; Makefile has no 'install phase > (lambda* (#:key outputs #:allow-other-keys) > (let* ((out (assoc-ref outputs "out")) > @@ -533,7 +525,7 @@ the InterLisp Standard.") > (install-file "flisp.boot" bin)))))))) > (synopsis "Scheme-like lisp implementation") > (description > - "@code{femtolisp} is a scheme-like lisp implementation with a > + "@code{femtolisp} is a Scheme-like lisp implementation with a I just noticed this.. I need to send the patch again. Anyone up to reviewing and applying it today so I can mark these threads as done? > simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. > The core is 12 builtin special forms and 33 builtin functions.") > (home-page "https://github.com/JeffBezanson/femtolisp") > -- > 2.10.0 > > Andreas: I reported the failing builds upstream to get conformation. https://github.com/JeffBezanson/femtolisp/issues/25 -- ng0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/2] gnu: Add femtolisp. 2016-09-14 12:03 ` ng0 2016-09-18 10:02 ` Andreas Enge 2016-09-18 12:20 ` [PATCH 1/2] gnu: Add femtolisp ng0 @ 2016-09-18 12:25 ` ng0 2 siblings, 0 replies; 24+ messages in thread From: ng0 @ 2016-09-18 12:25 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel [-- Attachment #1.1: Type: text/plain, Size: 88 bytes --] This patch fixes the mistake I had in the previous generation of it (Scheme -> scheme) [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.2: 0001-gnu-femtolisp-Remove-custom-patch-makefile-phase.patch --] [-- Type: text/x-patch, Size: 1661 bytes --] From 597f041ae43ddc85a466ef95a9d1b24c684925d0 Mon Sep 17 00:00:00 2001 From: ng0 <ng0@we.make.ritual.n0.is> Date: Tue, 13 Sep 2016 20:19:57 +0000 Subject: [PATCH] gnu: femtolisp: Remove custom "patch-makefile" phase. * gnu/packages/lisp.scm (femtolisp)[arguments]: Remove "patch-makefile" phase; specify test target; build "release" target instead of "default". --- gnu/packages/lisp.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3461de4..d1180a7 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -503,19 +503,11 @@ the InterLisp Standard.") "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") - #:tests? #f ; No make check + `(#:make-flags '("CC=gcc" "release") + #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) ; No configure script - ;; We have to remove the 'test phase because it requires - ;; the flisp binary to be present. Instead we run - ;; bootstrap.sh after the 'install phase. - (add-before 'build 'patch-makefile - (lambda _ - (substitute* "Makefile" - (("default: release test") "default: release")) - #t)) (replace 'install ; Makefile has no 'install phase (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.10.0 [-- Attachment #1.3: Type: text/plain, Size: 26 bytes --] -- ng0 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply related [flat|nested] 24+ messages in thread
end of thread, other threads:[~2016-09-27 16:30 UTC | newest] Thread overview: 24+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-13 19:04 [PATCH 1/2] gnu: Add femtolisp ng0 2016-09-13 19:04 ` [PATCH 2/2] gnu: lispf4: Remove unused inputs key ng0 2016-09-13 19:30 ` [PATCH 1/2] gnu: Add femtolisp Ricardo Wurmus 2016-09-13 19:45 ` ng0 2016-09-13 20:32 ` ng0 2016-09-14 9:00 ` Ricardo Wurmus 2016-09-14 9:31 ` ng0 2016-09-14 9:48 ` ng0 2016-09-14 10:03 ` Ricardo Wurmus 2016-09-14 10:15 ` ng0 2016-09-14 11:05 ` Ricardo Wurmus 2016-09-14 11:17 ` ng0 2016-09-14 12:03 ` ng0 2016-09-18 10:02 ` Andreas Enge 2016-09-20 6:14 ` Ludovic Courtès 2016-09-21 10:37 ` ng0 2016-09-21 15:33 ` Ludovic Courtès 2016-09-21 19:30 ` Ricardo Wurmus 2016-09-22 9:11 ` [PATCH] gnu: femtolisp: Remove support for mips and armhf ng0 2016-09-26 10:38 ` Ludovic Courtès 2016-09-27 8:13 ` ng0 2016-09-27 16:30 ` Leo Famulari 2016-09-18 12:20 ` [PATCH 1/2] gnu: Add femtolisp ng0 2016-09-18 12:25 ` ng0
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).