Package: guix-patches;
Reported by: Andy Tai <atai <at> atai.org>
Date: Sat, 11 May 2024 09:32:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 70875 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Sat, 11 May 2024 09:32:02 GMT) Full text and rfc822 format available.Andy Tai <atai <at> atai.org>:guix-patches <at> gnu.org.
(Sat, 11 May 2024 09:32:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: guix-patches <at> gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH] gnu: squirrel: Update to 3.2. Date: Sat, 11 May 2024 02:31:15 -0700
* gnu/packages/squirrel.scm (squirrel): Update to 3.2.
Change-Id: Iebb19806cdb98cb15e2e739657d4f90aa6eb596e
---
gnu/packages/squirrel.scm | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
index 1b9489882f..7f959cace0 100644
--- a/gnu/packages/squirrel.scm
+++ b/gnu/packages/squirrel.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Li-cheng (Andy) Tai <atai <at> atai.org>
+;;; Copyright © 2019, 2024 Li-cheng (Andy) Tai <atai <at> atai.org>
;;
;;; This file is part of GNU Guix.
;;;
@@ -22,6 +22,7 @@ (define-module (gnu packages squirrel)
#:use-module (gnu packages sphinx)
#:use-module (guix build-system cmake)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build utils)
#:use-module (guix packages)
@@ -30,17 +31,16 @@ (define-module (gnu packages squirrel)
(define-public squirrel
(package
(name "squirrel")
- (version "3.1")
+ (version "3.2")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/squirrel/squirrel3/"
- "squirrel " version " stable/squirrel_"
- (string-join (string-split version #\.) "_")
- "_stable.tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/albertodemichelis/squirrel.git")
+ (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1jyh1523zrrnh9swanfrda0s14mvwc9431dh07g0nx74hbxsfia8"))))
+ "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DDISABLE_STATIC=ON")
@@ -49,26 +49,16 @@ (define-public squirrel
(modify-phases %standard-phases
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (out (assoc-ref outputs "out"))
(doc-dir (string-append out "/share/doc/squirrel")))
(for-each
(lambda (file)
- (install-file (string-append "../squirrel3/" file) doc-dir))
+ (install-file (string-append source "/" file) doc-dir))
'("COPYRIGHT" "HISTORY" "README"
- "doc/sqstdlib3.pdf" "doc/squirrel3.pdf")))
- #t))
- (add-after 'install 'install-headers
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include-dir (string-append out "/include/squirrel")))
- (mkdir-p include-dir)
- (for-each
- (lambda (header-file)
- (copy-recursively header-file
- (string-append include-dir
- "/"
- (basename header-file))))
- (find-files "../squirrel3/include")))
+ ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO
+
+ )))
#t)))))
(native-inputs
`(("cmake" ,cmake-minimal)
base-commit: 703ae431f4ad28658e34675310b4fdf58685ccdd
--
2.34.1
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Sat, 11 May 2024 10:18:02 GMT) Full text and rfc822 format available.Message #8 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 70875 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v2] gnu: Add quirrel Date: Sat, 11 May 2024 03:16:31 -0700
* gnu/packages/squirrel.scm (quirrel): New variable
Change-Id: I3b25604f7c5cc4f046a6421810e3928d5c5ba276
---
gnu/packages/squirrel.scm | 64 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 63 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
index 1b9489882f..638f06ab8f 100644
--- a/gnu/packages/squirrel.scm
+++ b/gnu/packages/squirrel.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Li-cheng (Andy) Tai <atai <at> atai.org>
+;;; Copyright © 2019, 2023 Li-Cheng (Andy) Tai <atai <at> atai.org>
;;
;;; This file is part of GNU Guix.
;;;
@@ -22,6 +22,7 @@ (define-module (gnu packages squirrel)
#:use-module (gnu packages sphinx)
#:use-module (guix build-system cmake)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build utils)
#:use-module (guix packages)
@@ -81,3 +82,64 @@ (define-public squirrel
size, memory bandwidth, and real-time requirements of applications like video
games.")
(license license:expat)))
+
+
+
+(define-public quirrel
+ (package
+ (name "quirrel")
+ (version "4.6.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/GaijinEntertainment/quirrel.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "18xvhssnh5lddi4ava7wzzvsiin8rh3vrbhcblv7l00qv0brh6gg"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags '("-DDISABLE_STATIC=ON")
+ #:tests? #f ;no tests
+ #:phases (modify-phases %standard-phases
+ ;; TODO: build and install doc files like squirrel above
+ (add-after 'install 'install-headers
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (include-dir (string-append out "/include")))
+ (mkdir-p include-dir)
+ (for-each (lambda (header-file)
+ (copy-recursively header-file
+ (string-append
+ include-dir "/"
+ (basename header-file))))
+ (find-files "../include"))) #t)))))
+ (native-inputs `(("cmake" ,cmake-minimal)
+ ("python-sphinx" ,python-sphinx)))
+ (home-page "https://github.com/GaijinEntertainment/quirrel")
+ (synopsis "Script language that is based on Squirrel language and is
+inspired by Python, Javascript and especially Lua")
+ (description
+ "Quirrel is a script language that is based on Squirrel language and is
+inspired by Python, Javascript and especially Lua, with
+@itemize
+@item Lexical scoping
+@item Higher order functions, closures and lambda
+@item Classes and inheritance
+@item Tail recursion
+@item Delegation
+@item String interpolation
+@item Exception handling
+@item Cooperative threads (coroutines)
+@item Generators
+@item Performance - Quirrel is fast and small (comparable with Lua and sometimes even faster)
+@item Both compiler and virtual machine fit together in about 13k lines of C++ code and add only around 100kb-150kb the executable size.
+@item Automatic memory management (CPU bursts free - reference counting and GC)
+@item Optional 16bits characters strings
+@item Dynamic typing type system is close to Javascript but stricter and simpler (there is integer type and no 'undefined')
+@item Powerful embedding api
+@item Modules
+@item Hot-reload (if you implement it in your code)
+@end itemize")
+ (license license:expat)))
base-commit: 703ae431f4ad28658e34675310b4fdf58685ccdd
--
2.34.1
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Sat, 11 May 2024 17:04:02 GMT) Full text and rfc822 format available.Message #11 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 70875 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v3] gnu: squirrel: Update to 3.2. Date: Sat, 11 May 2024 10:01:55 -0700
* gnu/packages/squirrel.scm (squirrel): Update to 3.2.
Change-Id: Iebb19806cdb98cb15e2e739657d4f90aa6eb596e
---
gnu/packages/squirrel.scm | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
index 1b9489882f..7f959cace0 100644
--- a/gnu/packages/squirrel.scm
+++ b/gnu/packages/squirrel.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Li-cheng (Andy) Tai <atai <at> atai.org>
+;;; Copyright © 2019, 2024 Li-cheng (Andy) Tai <atai <at> atai.org>
;;
;;; This file is part of GNU Guix.
;;;
@@ -22,6 +22,7 @@ (define-module (gnu packages squirrel)
#:use-module (gnu packages sphinx)
#:use-module (guix build-system cmake)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build utils)
#:use-module (guix packages)
@@ -30,17 +31,16 @@ (define-module (gnu packages squirrel)
(define-public squirrel
(package
(name "squirrel")
- (version "3.1")
+ (version "3.2")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/squirrel/squirrel3/"
- "squirrel " version " stable/squirrel_"
- (string-join (string-split version #\.) "_")
- "_stable.tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/albertodemichelis/squirrel.git")
+ (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1jyh1523zrrnh9swanfrda0s14mvwc9431dh07g0nx74hbxsfia8"))))
+ "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DDISABLE_STATIC=ON")
@@ -49,26 +49,16 @@ (define-public squirrel
(modify-phases %standard-phases
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (out (assoc-ref outputs "out"))
(doc-dir (string-append out "/share/doc/squirrel")))
(for-each
(lambda (file)
- (install-file (string-append "../squirrel3/" file) doc-dir))
+ (install-file (string-append source "/" file) doc-dir))
'("COPYRIGHT" "HISTORY" "README"
- "doc/sqstdlib3.pdf" "doc/squirrel3.pdf")))
- #t))
- (add-after 'install 'install-headers
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include-dir (string-append out "/include/squirrel")))
- (mkdir-p include-dir)
- (for-each
- (lambda (header-file)
- (copy-recursively header-file
- (string-append include-dir
- "/"
- (basename header-file))))
- (find-files "../squirrel3/include")))
+ ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO
+
+ )))
#t)))))
(native-inputs
`(("cmake" ,cmake-minimal)
base-commit: 703ae431f4ad28658e34675310b4fdf58685ccdd
--
2.34.1
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Mon, 24 Jun 2024 03:43:02 GMT) Full text and rfc822 format available.Message #14 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Andy Tai <atai <at> atai.org> Cc: 70875 <at> debbugs.gnu.org Subject: Re: [bug#70875] [PATCH] gnu: squirrel: Update to 3.2. Date: Sun, 23 Jun 2024 23:41:00 -0400
Hi Andy,
Andy Tai <atai <at> atai.org> writes:
> * gnu/packages/squirrel.scm (squirrel): Update to 3.2.
Could you please detail the GNU ChangeLog commit message to declare what
you've done?
> Change-Id: Iebb19806cdb98cb15e2e739657d4f90aa6eb596e
> ---
> gnu/packages/squirrel.scm | 38 ++++++++++++++------------------------
> 1 file changed, 14 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
> index 1b9489882f..7f959cace0 100644
> --- a/gnu/packages/squirrel.scm
> +++ b/gnu/packages/squirrel.scm
> @@ -1,5 +1,5 @@
> ;;; GNU Guix --- Functional package management for GNU
> -;;; Copyright © 2019 Li-cheng (Andy) Tai <atai <at> atai.org>
> +;;; Copyright © 2019, 2024 Li-cheng (Andy) Tai <atai <at> atai.org>
> ;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -22,6 +22,7 @@ (define-module (gnu packages squirrel)
> #:use-module (gnu packages sphinx)
> #:use-module (guix build-system cmake)
> #:use-module (guix download)
> + #:use-module (guix git-download)
> #:use-module ((guix licenses) #:prefix license:)
> #:use-module (guix build utils)
> #:use-module (guix packages)
> @@ -30,17 +31,16 @@ (define-module (gnu packages squirrel)
> (define-public squirrel
> (package
> (name "squirrel")
> - (version "3.1")
> + (version "3.2")
> (source (origin
> - (method url-fetch)
> - (uri (string-append "mirror://sourceforge/squirrel/squirrel3/"
> - "squirrel " version " stable/squirrel_"
> - (string-join (string-split version #\.) "_")
> - "_stable.tar.gz"))
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/albertodemichelis/squirrel.git")
> + (commit (string-append "v" version))))
> (file-name (string-append name "-" version ".tar.gz"))
> (sha256
> (base32
> - "1jyh1523zrrnh9swanfrda0s14mvwc9431dh07g0nx74hbxsfia8"))))
> + "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z"))))
> (build-system cmake-build-system)
> (arguments
> '(#:configure-flags '("-DDISABLE_STATIC=ON")
> @@ -49,26 +49,16 @@ (define-public squirrel
> (modify-phases %standard-phases
> (add-after 'install 'install-documentation
> (lambda* (#:key outputs #:allow-other-keys)
> - (let* ((out (assoc-ref outputs "out"))
> + (let* ((source (assoc-ref %build-inputs "source"))
> + (out (assoc-ref outputs "out"))
> (doc-dir (string-append out "/share/doc/squirrel")))
> (for-each
> (lambda (file)
> - (install-file (string-append "../squirrel3/" file) doc-dir))
> + (install-file (string-append source "/" file) doc-dir))
> '("COPYRIGHT" "HISTORY" "README"
> - "doc/sqstdlib3.pdf" "doc/squirrel3.pdf")))
> - #t))
> - (add-after 'install 'install-headers
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let* ((out (assoc-ref outputs "out"))
> - (include-dir (string-append out "/include/squirrel")))
> - (mkdir-p include-dir)
> - (for-each
> - (lambda (header-file)
> - (copy-recursively header-file
> - (string-append include-dir
> - "/"
> - (basename header-file))))
> - (find-files "../squirrel3/include")))
> + ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO
> +
> + )))
> #t)))))
You've left this extraneous #t here.
> (native-inputs
> `(("cmake" ,cmake-minimal)
>
Labels could be removed as well, perhaps in a second patch.
Could you please send a v2?
--
Thanks,
Maxim
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
to control <at> debbugs.gnu.org.
(Mon, 24 Jun 2024 03:43:03 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Mon, 24 Jun 2024 03:45:02 GMT) Full text and rfc822 format available.Message #19 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Andy Tai <atai <at> atai.org> Cc: 70875 <at> debbugs.gnu.org Subject: Re: [bug#70875] [PATCH v2] gnu: Add quirrel Date: Sun, 23 Jun 2024 23:43:49 -0400
Hi,
Andy Tai <atai <at> atai.org> writes:
> * gnu/packages/squirrel.scm (quirrel): New variable
>
> Change-Id: I3b25604f7c5cc4f046a6421810e3928d5c5ba276
> ---
> gnu/packages/squirrel.scm | 64 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 63 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
> index 1b9489882f..638f06ab8f 100644
> --- a/gnu/packages/squirrel.scm
> +++ b/gnu/packages/squirrel.scm
> @@ -1,5 +1,5 @@
> ;;; GNU Guix --- Functional package management for GNU
> -;;; Copyright © 2019 Li-cheng (Andy) Tai <atai <at> atai.org>
> +;;; Copyright © 2019, 2023 Li-Cheng (Andy) Tai <atai <at> atai.org>
> ;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -22,6 +22,7 @@ (define-module (gnu packages squirrel)
> #:use-module (gnu packages sphinx)
> #:use-module (guix build-system cmake)
> #:use-module (guix download)
> + #:use-module (guix git-download)
> #:use-module ((guix licenses) #:prefix license:)
> #:use-module (guix build utils)
> #:use-module (guix packages)
> @@ -81,3 +82,64 @@ (define-public squirrel
> size, memory bandwidth, and real-time requirements of applications like video
> games.")
> (license license:expat)))
> +
> +
> +
> +(define-public quirrel
> + (package
> + (name "quirrel")
> + (version "4.6.0")
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/GaijinEntertainment/quirrel.git")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "18xvhssnh5lddi4ava7wzzvsiin8rh3vrbhcblv7l00qv0brh6gg"))))
> + (build-system cmake-build-system)
> + (arguments
> + '(#:configure-flags '("-DDISABLE_STATIC=ON")
> + #:tests? #f ;no tests
> + #:phases (modify-phases %standard-phases
> + ;; TODO: build and install doc files like squirrel above
> + (add-after 'install 'install-headers
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (include-dir (string-append out "/include")))
New packages should use gexps for phases, and gexp variables such as
#$output to refer to the "out" output.
> + (mkdir-p include-dir)
> + (for-each (lambda (header-file)
> + (copy-recursively header-file
> + (string-append
> + include-dir "/"
> + (basename header-file))))
> + (find-files "../include"))) #t)))))
> + (native-inputs `(("cmake" ,cmake-minimal)
> + ("python-sphinx" ,python-sphinx)))
Do not add labels anymore, which are deprecated.
> + (home-page "https://github.com/GaijinEntertainment/quirrel")
> + (synopsis "Script language that is based on Squirrel language and is
> +inspired by Python, Javascript and especially Lua")
> + (description
> + "Quirrel is a script language that is based on Squirrel language and is
> +inspired by Python, Javascript and especially Lua, with
> +@itemize
> +@item Lexical scoping
> +@item Higher order functions, closures and lambda
> +@item Classes and inheritance
> +@item Tail recursion
> +@item Delegation
> +@item String interpolation
> +@item Exception handling
> +@item Cooperative threads (coroutines)
> +@item Generators
> +@item Performance - Quirrel is fast and small (comparable with Lua and sometimes even faster)
> +@item Both compiler and virtual machine fit together in about 13k lines of C++ code and add only around 100kb-150kb the executable size.
Please wrap long lines at 80 chars.
> +@item Automatic memory management (CPU bursts free - reference counting and GC)
> +@item Optional 16bits characters strings
> +@item Dynamic typing type system is close to Javascript but stricter and simpler (there is integer type and no 'undefined')
> +@item Powerful embedding api
> +@item Modules
> +@item Hot-reload (if you implement it in your code)
> +@end itemize")
> + (license license:expat)))
Otherwise it looks good to me. Could you please send a v2?
--
Thanks,
Maxim
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Mon, 24 Jun 2024 13:36:02 GMT) Full text and rfc822 format available.Message #22 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: 70875 <at> debbugs.gnu.org Subject: Re: [bug#70875] [PATCH] gnu: squirrel: Update to 3.2. Date: Mon, 24 Jun 2024 06:33:16 -0700
will do > Could you please send a v2?
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Mon, 24 Jun 2024 13:36:02 GMT) Full text and rfc822 format available.Message #25 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: 70875 <at> debbugs.gnu.org Subject: Re: [bug#70875] [PATCH v2] gnu: Add quirrel Date: Mon, 24 Jun 2024 06:34:04 -0700
will do > Otherwise it looks good to me. Could you please send a v2?
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Tue, 25 Jun 2024 05:15:02 GMT) Full text and rfc822 format available.Message #28 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 70875 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v4 0/2] squirrel: Update Date: Mon, 24 Jun 2024 22:13:03 -0700
squirrel: Update and code reformat Andy Tai (2): gnu: squirrel: Update to 3.2. gnu: squirrel: Code reformat. gnu/packages/squirrel.scm | 68 ++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 41 deletions(-) base-commit: 78d946b01162fbe986c6768800e8cfd6e70e67e5 -- 2.34.1
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Tue, 25 Jun 2024 05:15:02 GMT) Full text and rfc822 format available.Message #31 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 70875 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v4 2/2] gnu: squirrel: Code reformat. Date: Mon, 24 Jun 2024 22:13:05 -0700
* gnu/packages/squirrel.scm (squirrel): Code reformat.
[native-inputs]: Switch to gexp format.
Change-Id: Id487820e4d0e28491157fac8be38cf483eb78dad
---
gnu/packages/squirrel.scm | 51 ++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
index a318eb3815..43e433cc82 100644
--- a/gnu/packages/squirrel.scm
+++ b/gnu/packages/squirrel.scm
@@ -32,36 +32,33 @@ (define-public squirrel
(package
(name "squirrel")
(version "3.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/albertodemichelis/squirrel.git")
- (commit (string-append "v" version))))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/albertodemichelis/squirrel.git")
+ (commit (string-append "v" version))))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DDISABLE_STATIC=ON")
- #:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-documentation
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((source (assoc-ref %build-inputs "source"))
- (out (assoc-ref outputs "out"))
- (doc-dir (string-append out "/share/doc/squirrel")))
- (for-each
- (lambda (file)
- (install-file (string-append source "/" file) doc-dir))
- '("COPYRIGHT" "HISTORY" "README"
- ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO
-
- ))))))))
- (native-inputs
- `(("cmake" ,cmake-minimal)
- ("python-sphinx" ,python-sphinx)))
+ #:tests? #f ;no tests
+ #:phases (modify-phases %standard-phases
+ (add-after 'install 'install-documentation
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (out (assoc-ref outputs "out"))
+ (doc-dir (string-append out "/share/doc/squirrel")))
+ (for-each (lambda (file)
+ (install-file (string-append source "/"
+ file) doc-dir))
+ '("COPYRIGHT" "HISTORY" "README"
+ ;; "doc/sqstdlib3.pdf" "doc/squirrel3.pdf"
+ ;; pdf not build out of git; TODO
+ ))))))))
+ (native-inputs (list cmake-minimal python-sphinx))
(home-page "https://squirrel-lang.org/")
(synopsis "High level imperative, object-oriented programming language")
(description
--
2.34.1
guix-patches <at> gnu.org:bug#70875; Package guix-patches.
(Tue, 25 Jun 2024 05:15:03 GMT) Full text and rfc822 format available.Message #34 received at 70875 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 70875 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v4 1/2] gnu: squirrel: Update to 3.2. Date: Mon, 24 Jun 2024 22:13:04 -0700
* gnu/packages/squirrel.scm (squirrel): Update to 3.2.
[source](origin): Switch to fetch from git with
version tag.
[arguments](phases): In install stage, adjust for
source file location changes and do not install
pdf doc files for they are not generated in build.
Change-Id: Iebb19806cdb98cb15e2e739657d4f90aa6eb596e
---
gnu/packages/squirrel.scm | 39 ++++++++++++++-------------------------
1 file changed, 14 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm
index 1b9489882f..a318eb3815 100644
--- a/gnu/packages/squirrel.scm
+++ b/gnu/packages/squirrel.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Li-cheng (Andy) Tai <atai <at> atai.org>
+;;; Copyright © 2019, 2024 Li-cheng (Andy) Tai <atai <at> atai.org>
;;
;;; This file is part of GNU Guix.
;;;
@@ -22,6 +22,7 @@ (define-module (gnu packages squirrel)
#:use-module (gnu packages sphinx)
#:use-module (guix build-system cmake)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build utils)
#:use-module (guix packages)
@@ -30,17 +31,16 @@ (define-module (gnu packages squirrel)
(define-public squirrel
(package
(name "squirrel")
- (version "3.1")
+ (version "3.2")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/squirrel/squirrel3/"
- "squirrel " version " stable/squirrel_"
- (string-join (string-split version #\.) "_")
- "_stable.tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/albertodemichelis/squirrel.git")
+ (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1jyh1523zrrnh9swanfrda0s14mvwc9431dh07g0nx74hbxsfia8"))))
+ "028v90k5bbcb8qwysgv6r0ycy6g920ns32i2sdq0i8hqib90ac5z"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DDISABLE_STATIC=ON")
@@ -49,27 +49,16 @@ (define-public squirrel
(modify-phases %standard-phases
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (out (assoc-ref outputs "out"))
(doc-dir (string-append out "/share/doc/squirrel")))
(for-each
(lambda (file)
- (install-file (string-append "../squirrel3/" file) doc-dir))
+ (install-file (string-append source "/" file) doc-dir))
'("COPYRIGHT" "HISTORY" "README"
- "doc/sqstdlib3.pdf" "doc/squirrel3.pdf")))
- #t))
- (add-after 'install 'install-headers
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include-dir (string-append out "/include/squirrel")))
- (mkdir-p include-dir)
- (for-each
- (lambda (header-file)
- (copy-recursively header-file
- (string-append include-dir
- "/"
- (basename header-file))))
- (find-files "../squirrel3/include")))
- #t)))))
+ ;"doc/sqstdlib3.pdf" "doc/squirrel3.pdf" ;; pdf not build out of git; TODO
+
+ ))))))))
(native-inputs
`(("cmake" ,cmake-minimal)
("python-sphinx" ,python-sphinx)))
--
2.34.1
Andy Tai <atai <at> atai.org>
to control <at> debbugs.gnu.org.
(Tue, 25 Jun 2024 05:30:02 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.