--- Begin Message ---
|
Subject: |
[PATCH] build-system: chicken: Added insert-missing-version phase |
|
Date: |
Sun, 12 Jun 2022 00:45:20 +0000 |
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
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [PATCH] build-system: chicken: Added stamp-egg-version phase |
|
Date: |
Tue, 21 Jun 2022 21:44:02 +0200 |
|
User-agent: |
Evolution 3.42.1 |
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
--- End Message ---