unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#74000] [PATCH] gnu: Add owl.
@ 2024-10-25  5:42 Juliana Sims via Guix-patches via
  2024-10-25  5:48 ` [bug#74000] [PATCH v2] " Juliana Sims via Guix-patches via
  2024-10-28  8:56 ` bug#74000: Close Andreas Enge
  0 siblings, 2 replies; 7+ messages in thread
From: Juliana Sims via Guix-patches via @ 2024-10-25  5:42 UTC (permalink / raw)
  To: 74000; +Cc: Juliana Sims

* gnu/packages/scheme.scm (owl): New symbol.

Change-Id: Ibb242bbcdedb92419b59e05635e8a32e85afc24e
---

Hello,

This patch adds a package for Owl Lisp.

Thanks,
Juli
 gnu/packages/scheme.scm | 44 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 0d6a662aaa..bbd7ee7bfa 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
 ;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
-;;; Copyright © 2023 Juliana Sims <juli@incana.org>
+;;; Copyright © 2023, 2024 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -71,6 +71,7 @@ (define-module (gnu packages scheme)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libevent)
@@ -1273,6 +1274,43 @@ (define-public emacs-gerbil-mode
      "Gerbil mode provides font-lock, indentation, navigation, and REPL for
 Gerbil code within Emacs.")))
 
+(define-public owl
+  (package
+    (name "owl")
+    (version "0.2.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/owl-lisp/owl.git")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32 "0jlmpw14rg63m1q7pjmhjicaqbqgc6gnp53bph0giwg8ha8wxyqr"))
+              (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags #~`(,(string-append "PREFIX=" #$output))
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure)
+                   (add-after 'patch-source-shebangs 'patch-ol-shebangs
+                     (lambda _
+                       (map (lambda (f)
+                              (substitute* f
+                                (("/usr") #$output)))
+                            (list "bin/feather"
+                                  "tests/hashbang.scm"
+                                  "tests/theorem-rand.scm")))))
+      #:test-target "test"))
+    (native-inputs (list pandoc which))
+    (home-page "https://haltp.org/owl")
+    (synopsis "Functional Scheme dialect")
+    (description
+     "Owl Lisp is a simple programming language.  It is intended to provide a
+portable system for writing standalone programs in a subjectively pleasant
+dialect of Lisp.  It has a minimal core and runtime, purely functional
+operation, and suppport for asynchronous evaluation.")
+    (license expat)))
+
 (define-public stklos
   (package
     (name "stklos")
@@ -1294,8 +1332,8 @@ (define-public stklos
                   ,@%default-gnu-modules)
       #:configure-flags
       #~(list (string-append "LDFLAGS=-L"
-                #$(this-package-input "readline")
-                "/lib -lreadline"))
+                             #$(this-package-input "readline")
+                             "/lib -lreadline"))
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'configure 'patch-sh-references

base-commit: 2394a7f5fbf60dd6adc0a870366adb57166b6d8b
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#74000] [PATCH v2] gnu: Add owl.
  2024-10-25  5:42 [bug#74000] [PATCH] gnu: Add owl Juliana Sims via Guix-patches via
@ 2024-10-25  5:48 ` Juliana Sims via Guix-patches via
  2024-10-26 14:22   ` Zheng Junjie
  2024-10-28  8:56 ` bug#74000: Close Andreas Enge
  1 sibling, 1 reply; 7+ messages in thread
From: Juliana Sims via Guix-patches via @ 2024-10-25  5:48 UTC (permalink / raw)
  To: 74000; +Cc: Juliana Sims

* gnu/packages/scheme.scm (owl): New symbol.

Change-Id: I3dbbe1143f4928c3ecfc42c6a7a6be8a6b524629
---

Woops, Emacs decided to reindent unrelated code!

This version is clean of such errors :)

-Juli
 gnu/packages/scheme.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 0d6a662aaa..637893e0f1 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
 ;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
-;;; Copyright © 2023 Juliana Sims <juli@incana.org>
+;;; Copyright © 2023, 2024 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -71,6 +71,7 @@ (define-module (gnu packages scheme)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libevent)
@@ -1273,6 +1274,43 @@ (define-public emacs-gerbil-mode
      "Gerbil mode provides font-lock, indentation, navigation, and REPL for
 Gerbil code within Emacs.")))
 
+(define-public owl
+  (package
+    (name "owl")
+    (version "0.2.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/owl-lisp/owl.git")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32 "0jlmpw14rg63m1q7pjmhjicaqbqgc6gnp53bph0giwg8ha8wxyqr"))
+              (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags #~`(,(string-append "PREFIX=" #$output))
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure)
+                   (add-after 'patch-source-shebangs 'patch-ol-shebangs
+                     (lambda _
+                       (map (lambda (f)
+                              (substitute* f
+                                (("/usr") #$output)))
+                            (list "bin/feather"
+                                  "tests/hashbang.scm"
+                                  "tests/theorem-rand.scm")))))
+      #:test-target "test"))
+    (native-inputs (list pandoc which))
+    (home-page "https://haltp.org/owl")
+    (synopsis "Functional Scheme dialect")
+    (description
+     "Owl Lisp is a simple programming language.  It is intended to provide a
+portable system for writing standalone programs in a subjectively pleasant
+dialect of Lisp.  It has a minimal core and runtime, purely functional
+operation, and suppport for asynchronous evaluation.")
+    (license expat)))
+
 (define-public stklos
   (package
     (name "stklos")

base-commit: 2394a7f5fbf60dd6adc0a870366adb57166b6d8b
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#74000] [PATCH v2] gnu: Add owl.
  2024-10-25  5:48 ` [bug#74000] [PATCH v2] " Juliana Sims via Guix-patches via
@ 2024-10-26 14:22   ` Zheng Junjie
  2024-10-26 17:54     ` [bug#74000] [PATCH v3] " Juliana Sims via Guix-patches via
  0 siblings, 1 reply; 7+ messages in thread
From: Zheng Junjie @ 2024-10-26 14:22 UTC (permalink / raw)
  To: 74000; +Cc: juli

[-- Attachment #1: Type: text/plain, Size: 4006 bytes --]

Juliana Sims via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/scheme.scm (owl): New symbol.
>
> Change-Id: I3dbbe1143f4928c3ecfc42c6a7a6be8a6b524629
> ---
>
> Woops, Emacs decided to reindent unrelated code!
>
> This version is clean of such errors :)
>
> -Juli
>  gnu/packages/scheme.scm | 40 +++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
> index 0d6a662aaa..637893e0f1 100644
> --- a/gnu/packages/scheme.scm
> +++ b/gnu/packages/scheme.scm
> @@ -21,7 +21,7 @@
>  ;;; Copyright © 2022 jgart <jgart@dismail.de>
>  ;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
>  ;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
> -;;; Copyright © 2023 Juliana Sims <juli@incana.org>
> +;;; Copyright © 2023, 2024 Juliana Sims <juli@incana.org>
>  ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
>  ;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
>  ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
> @@ -71,6 +71,7 @@ (define-module (gnu packages scheme)
>    #:use-module (gnu packages gl)
>    #:use-module (gnu packages glib)
>    #:use-module (gnu packages gtk)
> +  #:use-module (gnu packages haskell-xyz)
>    #:use-module (gnu packages image)
>    #:use-module (gnu packages libedit)
>    #:use-module (gnu packages libevent)
> @@ -1273,6 +1274,43 @@ (define-public emacs-gerbil-mode
>       "Gerbil mode provides font-lock, indentation, navigation, and REPL for
>  Gerbil code within Emacs.")))
>  
> +(define-public owl
> +  (package
> +    (name "owl")
> +    (version "0.2.2")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://gitlab.com/owl-lisp/owl.git")
> +                    (commit (string-append "v" version))))
> +              (sha256
> +               (base32 "0jlmpw14rg63m1q7pjmhjicaqbqgc6gnp53bph0giwg8ha8wxyqr"))
> +              (file-name (git-file-name name version))))

usually we put file-name after uri

> +    (build-system gnu-build-system)
> +    (arguments
> +     (list
> +      #:make-flags #~`(,(string-append "PREFIX=" #$output))

please set (string-append "CC=" #$(cc-for-target)) , allow cross-compiling.

like: #~(list (string-append "CC=" #$(cc-for-target))
              (string-append "PREFIX=" #$output))

> +      #:phases #~(modify-phases %standard-phases
> +                   (delete 'configure)

please add ; No configure script
Let us know why it was deleted.

> +                   (add-after 'patch-source-shebangs 'patch-ol-shebangs
> +                     (lambda _
> +                       (map (lambda (f)
> +                              (substitute* f
> +                                (("/usr") #$output)))
> +                            (list "bin/feather"
> +                                  "tests/hashbang.scm"
> +                                  "tests/theorem-rand.scm")))))
just

(substitute* (list "bin/feather"
                   "tests/hashbang.scm"
                   "tests/theorem-rand.scm")
   (("/usr") #$output))

> +      #:test-target "test"))
> +    (native-inputs (list pandoc which))

pandoc is development dependence, so no needed add it.


> +    (home-page "https://haltp.org/owl")

guix lint say: https://haltp.org/owl/

> +    (synopsis "Functional Scheme dialect")
> +    (description
> +     "Owl Lisp is a simple programming language.  It is intended to provide a
> +portable system for writing standalone programs in a subjectively pleasant
> +dialect of Lisp.  It has a minimal core and runtime, purely functional
> +operation, and suppport for asynchronous evaluation.")
> +    (license expat)))
> +
>  (define-public stklos
>    (package
>      (name "stklos")
>
> base-commit: 2394a7f5fbf60dd6adc0a870366adb57166b6d8b

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#74000] [PATCH v3] gnu: Add owl.
  2024-10-26 14:22   ` Zheng Junjie
@ 2024-10-26 17:54     ` Juliana Sims via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: Juliana Sims via Guix-patches via @ 2024-10-26 17:54 UTC (permalink / raw)
  To: zhengjunjie; +Cc: 74000, Juliana Sims

* gnu/packages/scheme.scm (owl): New symbol.

Change-Id: I3dbbe1143f4928c3ecfc42c6a7a6be8a6b524629
---

Hi,

Thanks for the quick review!  When I finished packaging this on a whim at 01:30,
I thought to myself, "Gee, that was fast!  ...did I forget something?"  And
indeed I did; I forgot to run guix lint, cross-compile, build for different
architectures, ensure reproducibility, and argue with guix style.  So, here we
have a proper version of the patch!  (I disagreed with some of guix style's
opinions.)

Thanks again!
-Juli

 gnu/packages/scheme.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 0d6a662aaa..29142f474b 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
 ;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
-;;; Copyright © 2023 Juliana Sims <juli@incana.org>
+;;; Copyright © 2023, 2024 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -71,6 +71,7 @@ (define-module (gnu packages scheme)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libevent)
@@ -1273,6 +1274,43 @@ (define-public emacs-gerbil-mode
      "Gerbil mode provides font-lock, indentation, navigation, and REPL for
 Gerbil code within Emacs.")))
 
+(define-public owl
+  (package
+    (name "owl")
+    (version "0.2.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/owl-lisp/owl.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jlmpw14rg63m1q7pjmhjicaqbqgc6gnp53bph0giwg8ha8wxyqr"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+                           (string-append "PREFIX=" #$output))
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'configure)  ;No configure script
+                   (add-after 'patch-source-shebangs 'patch-ol-shebangs
+                     (lambda _
+                       (substitute* (list "bin/feather"
+                                          "tests/hashbang.scm"
+                                          "tests/theorem-rand.scm")
+                         (("/usr") #$output)))))
+      #:test-target "test"))
+    (native-inputs (list which))
+    (home-page "https://haltp.org/posts/owl.html")
+    (synopsis "Functional Scheme dialect")
+    (description
+     "Owl Lisp is a simple programming language.  It is intended to provide a
+portable system for writing standalone programs in a subjectively pleasant
+dialect of Lisp.  It has a minimal core and runtime, purely functional
+operation, immutable lists, and suppport for asynchronous evaluation.")
+    (license expat)))
+
 (define-public stklos
   (package
     (name "stklos")

base-commit: df666602c7936f7d87354374b148ef6269844c01
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* bug#74000: Close
  2024-10-25  5:42 [bug#74000] [PATCH] gnu: Add owl Juliana Sims via Guix-patches via
  2024-10-25  5:48 ` [bug#74000] [PATCH v2] " Juliana Sims via Guix-patches via
@ 2024-10-28  8:56 ` Andreas Enge
  2024-10-28 10:27   ` [bug#74000] Close Z572
  1 sibling, 1 reply; 7+ messages in thread
From: Andreas Enge @ 2024-10-28  8:56 UTC (permalink / raw)
  To: 74000-done

Pushed with a tiny change to the commit message, thanks!

Andreas





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#74000] Close
  2024-10-28  8:56 ` bug#74000: Close Andreas Enge
@ 2024-10-28 10:27   ` Z572
  2024-10-28 10:58     ` Andreas Enge
  0 siblings, 1 reply; 7+ messages in thread
From: Z572 @ 2024-10-28 10:27 UTC (permalink / raw)
  To: 74000; +Cc: andreas, juli

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

Andreas Enge <andreas@enge.fr> writes:

> Pushed with a tiny change to the commit message, thanks!
>
> Andreas

Seems to have applied the wrong version,
https://issues.guix.gnu.org/74000#3 is rignt version


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#74000] Close
  2024-10-28 10:27   ` [bug#74000] Close Z572
@ 2024-10-28 10:58     ` Andreas Enge
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Enge @ 2024-10-28 10:58 UTC (permalink / raw)
  To: Z572; +Cc: 74000, efraim, juli

Am Mon, Oct 28, 2024 at 06:27:37PM +0800 schrieb Z572:
> Seems to have applied the wrong version,
> https://issues.guix.gnu.org/74000#3 is rignt version

Sorry, I managed to completely miss the discussion of the patch!
I have applied the changes by hand and pushed an updated version.

Andreas





^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-10-28 10:59 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-25  5:42 [bug#74000] [PATCH] gnu: Add owl Juliana Sims via Guix-patches via
2024-10-25  5:48 ` [bug#74000] [PATCH v2] " Juliana Sims via Guix-patches via
2024-10-26 14:22   ` Zheng Junjie
2024-10-26 17:54     ` [bug#74000] [PATCH v3] " Juliana Sims via Guix-patches via
2024-10-28  8:56 ` bug#74000: Close Andreas Enge
2024-10-28 10:27   ` [bug#74000] Close Z572
2024-10-28 10:58     ` Andreas Enge

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).