* [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase
@ 2022-06-12 0:45 Michal Atlas
2022-06-15 11:26 ` Liliana Marie Prikler
2022-06-19 20:36 ` [bug#55920] [PATCH] build-system: chicken: Added stamp-egg-version phase Michal Atlas
0 siblings, 2 replies; 7+ messages in thread
From: Michal Atlas @ 2022-06-12 0:45 UTC (permalink / raw)
To: 55920; +Cc: Michal Atlas
Many .egg files don't contain version information,
this causes `chicken-install` to label them {unknown},
which makes it fail compilations whenever a
dependency is tagged with a minimum-version.
I am unaware of a way to force this check to not-happen
and the version information should be included anyway,
so this patch should fix the problem.
---
guix/build/chicken-build-system.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/guix/build/chicken-build-system.scm b/guix/build/chicken-build-system.scm
index 5db9906acf..341ab64a0f 100644
--- a/guix/build/chicken-build-system.scm
+++ b/guix/build/chicken-build-system.scm
@@ -112,6 +112,17 @@ (define* (check #:key egg-name tests? #:allow-other-keys)
(when tests?
(invoke "chicken-install" "-cached" "-test" "-no-install" egg-name)))
+(define* (insert-missing-version #:key egg-name name #:allow-other-keys)
+ "Inserts version information into the .egg file if it isn't contained already"
+ (let* ([filename (string-append egg-name "/" egg-name ".egg")]
+ [egg-info (call-with-input-file filename read)]
+ [ver? (find (λ (i) (eqv? (car i) 'version)) egg-info)]
+ [ver (substring name (1+ (string-rindex name #\-)))])
+ (when (not ver?)
+ (make-file-writable filename)
+ (call-with-output-file filename
+ (λ (f) (write (cons `(version ,ver) egg-info) f))))))
+
;; It doesn't look like Chicken generates any unnecessary references.
;; So we don't have to remove them either. Nice.
@@ -122,6 +133,7 @@ (define %standard-phases
(delete 'configure)
(delete 'patch-generated-file-shebangs)
(add-before 'unpack 'setup-chicken-environment setup-chicken-environment)
+ (add-before 'build 'insert-missing-version insert-missing-version)
(replace 'build build)
(delete 'check)
(replace 'install install)
base-commit: 1643402950b2d2384ec74fb69e059cc6a4c4ebed
--
2.36.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase
2022-06-12 0:45 [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase Michal Atlas
@ 2022-06-15 11:26 ` Liliana Marie Prikler
2022-06-15 11:29 ` Maxime Devos
2022-06-15 11:40 ` Tobias Geerinckx-Rice via Guix-patches via
2022-06-19 20:36 ` [bug#55920] [PATCH] build-system: chicken: Added stamp-egg-version phase Michal Atlas
1 sibling, 2 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-06-15 11:26 UTC (permalink / raw)
To: Michal Atlas, 55920
Am Sonntag, dem 12.06.2022 um 00:45 +0000 schrieb Michal Atlas:
> Many .egg files don't contain version information,
> this causes `chicken-install` to label them {unknown},
> which makes it fail compilations whenever a
> dependency is tagged with a minimum-version.
>
> I am unaware of a way to force this check to not-happen
> and the version information should be included anyway,
> so this patch should fix the problem.
> ---
Put the blurb below this line, add a ChangeLog above.
> guix/build/chicken-build-system.scm | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/guix/build/chicken-build-system.scm
> b/guix/build/chicken-build-system.scm
> index 5db9906acf..341ab64a0f 100644
> --- a/guix/build/chicken-build-system.scm
> +++ b/guix/build/chicken-build-system.scm
> @@ -112,6 +112,17 @@ (define* (check #:key egg-name tests? #:allow-
> other-keys)
> (when tests?
> (invoke "chicken-install" "-cached" "-test" "-no-install" egg-
> name)))
>
> +(define* (insert-missing-version #:key egg-name name #:allow-other-
> keys)
I find "stamp-egg-version" funnier.
> + "Inserts version information into the .egg file if it isn't
> contained already"
> + (let* ([filename (string-append egg-name "/" egg-name ".egg")]
> + [egg-info (call-with-input-file filename read)]
> + [ver? (find (λ (i) (eqv? (car i) 'version)) egg-info)]
> + [ver (substring name (1+ (string-rindex name #\-)))])
We don't do square brackets in Guile. Also, using λ rather than
spelling out "lambda" results in a syntax error.
> + (when (not ver?)
> + (make-file-writable filename)
> + (call-with-output-file filename
> + (λ (f) (write (cons `(version ,ver) egg-info) f))))))
"lambda".
> ;; It doesn't look like Chicken generates any unnecessary
> references.
> ;; So we don't have to remove them either. Nice.
>
> @@ -122,6 +133,7 @@ (define %standard-phases
> (delete 'configure)
> (delete 'patch-generated-file-shebangs)
> (add-before 'unpack 'setup-chicken-environment setup-chicken-
> environment)
> + (add-before 'build 'insert-missing-version insert-missing-
> version)
Note that 'insert-missing-version will always be logged even if the
version is not actually missing.
> (replace 'build build)
> (delete 'check)
> (replace 'install install)
Cheers
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase
2022-06-15 11:26 ` Liliana Marie Prikler
@ 2022-06-15 11:29 ` Maxime Devos
2022-06-15 11:32 ` Liliana Marie Prikler
2022-06-15 11:40 ` Tobias Geerinckx-Rice via Guix-patches via
1 sibling, 1 reply; 7+ messages in thread
From: Maxime Devos @ 2022-06-15 11:29 UTC (permalink / raw)
To: Liliana Marie Prikler, Michal Atlas, 55920
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
Liliana Marie Prikler schreef op wo 15-06-2022 om 13:26 [+0200]:
> We don't do square brackets in Guile. Also, using λ rather than
> spelling out "lambda" results in a syntax error.
This construct seems to work fine for me:
> (let ((id (λ (x) x))) (id 0))
$2 = 0
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase
2022-06-15 11:29 ` Maxime Devos
@ 2022-06-15 11:32 ` Liliana Marie Prikler
0 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-06-15 11:32 UTC (permalink / raw)
To: Maxime Devos, Michal Atlas, 55920
Am Mittwoch, dem 15.06.2022 um 13:29 +0200 schrieb Maxime Devos:
> Liliana Marie Prikler schreef op wo 15-06-2022 om 13:26 [+0200]:
> > We don't do square brackets in Guile. Also, using λ rather than
> > spelling out "lambda" results in a syntax error.
>
> This construct seems to work fine for me:
>
> > (let ((id (λ (x) x))) (id 0))
> $2 = 0
>
> Greetings,
> Maxime.
My bad, I only typed the letter λ into a repl and brain-grepped for
syntax error. Still, the long form ought to be used in my opinion,
because that's the one that editors are more likely to look out for.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase
2022-06-15 11:26 ` Liliana Marie Prikler
2022-06-15 11:29 ` Maxime Devos
@ 2022-06-15 11:40 ` Tobias Geerinckx-Rice via Guix-patches via
1 sibling, 0 replies; 7+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2022-06-15 11:40 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 55920, michal_atlas
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
Liliana Marie Prikler 写道:
>Also, using λ rather than spelling out "lambda" results in a
>syntax error.
Not true, but we conventionally don't use λ in Guix code. There
are a good few counterexamples that snuck in over the years,
though.
Kind regards,
T G-R
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#55920] [PATCH] build-system: chicken: Added stamp-egg-version phase
2022-06-12 0:45 [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase Michal Atlas
2022-06-15 11:26 ` Liliana Marie Prikler
@ 2022-06-19 20:36 ` Michal Atlas
2022-06-21 19:44 ` bug#55920: " Liliana Marie Prikler
1 sibling, 1 reply; 7+ messages in thread
From: Michal Atlas @ 2022-06-19 20:36 UTC (permalink / raw)
To: 55920; +Cc: Michal Atlas
* guix/build/chicken-build-system.scm (stamp-egg-version): New phase
Compiled eggs will now always contain some version,
falling back to the guix package version if none is provided by the egg.
(%standard-phases): Inserted the new phase
---
Many .egg files don't contain version information,
this causes `chicken-install` to label them as "unknown",
which causes it to fail compilations whenever a
dependency is tagged with a minimum-version.
I am unaware of a way to disable the version check
and the version information should be included anyway,
so this patch should fix the problem.
---
guix/build/chicken-build-system.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/guix/build/chicken-build-system.scm b/guix/build/chicken-build-system.scm
index 5db9906acf..c0a4986032 100644
--- a/guix/build/chicken-build-system.scm
+++ b/guix/build/chicken-build-system.scm
@@ -112,6 +112,17 @@ (define* (check #:key egg-name tests? #:allow-other-keys)
(when tests?
(invoke "chicken-install" "-cached" "-test" "-no-install" egg-name)))
+(define* (stamp-egg-version #:key egg-name name #:allow-other-keys)
+ "Inserts version information into the .egg file if it isn't contained already"
+ (let* ((filename (string-append egg-name "/" egg-name ".egg"))
+ (egg-info (call-with-input-file filename read))
+ (ver? (find (lambda (i) (eqv? (car i) 'version)) egg-info))
+ (ver (substring name (1+ (string-rindex name #\-)))))
+ (when (not ver?)
+ (make-file-writable filename)
+ (call-with-output-file filename
+ (lambda (f) (write (cons `(version ,ver) egg-info) f))))))
+
;; It doesn't look like Chicken generates any unnecessary references.
;; So we don't have to remove them either. Nice.
@@ -122,6 +133,7 @@ (define %standard-phases
(delete 'configure)
(delete 'patch-generated-file-shebangs)
(add-before 'unpack 'setup-chicken-environment setup-chicken-environment)
+ (add-before 'build 'stamp-egg-version stamp-egg-version)
(replace 'build build)
(delete 'check)
(replace 'install install)
--
2.36.1
---
Hopefully I understood your comments well.
> Note that 'insert-missing-version will always be logged
I was aware of that but
didn't find anything about making a phase optional,
good thing it has a more sensible name now.
Cheers
^ permalink raw reply related [flat|nested] 7+ messages in thread
* bug#55920: [PATCH] build-system: chicken: Added stamp-egg-version phase
2022-06-19 20:36 ` [bug#55920] [PATCH] build-system: chicken: Added stamp-egg-version phase Michal Atlas
@ 2022-06-21 19:44 ` Liliana Marie Prikler
0 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-06-21 19:44 UTC (permalink / raw)
To: Michal Atlas, 55920-done
Am Sonntag, dem 19.06.2022 um 20:36 +0000 schrieb Michal Atlas:
> * guix/build/chicken-build-system.scm (stamp-egg-version): New phase
> Compiled eggs will now always contain some version,
> falling back to the guix package version if none is provided by the
> egg.
> (%standard-phases): Inserted the new phase
Pushed with some wording fixes. Cheers
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-06-21 19:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-12 0:45 [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase Michal Atlas
2022-06-15 11:26 ` Liliana Marie Prikler
2022-06-15 11:29 ` Maxime Devos
2022-06-15 11:32 ` Liliana Marie Prikler
2022-06-15 11:40 ` Tobias Geerinckx-Rice via Guix-patches via
2022-06-19 20:36 ` [bug#55920] [PATCH] build-system: chicken: Added stamp-egg-version phase Michal Atlas
2022-06-21 19:44 ` bug#55920: " Liliana Marie Prikler
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.