From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at>
To: Michal Atlas <michal_atlas@posteo.net>, 55920@debbugs.gnu.org
Subject: [bug#55920] [PATCH] build-system: chicken: Added insert-missing-version phase
Date: Wed, 15 Jun 2022 13:26:27 +0200 [thread overview]
Message-ID: <ae8d77255602d71ecc3ee958a086bde12caa6709.camel@ist.tugraz.at> (raw)
In-Reply-To: <20220612004520.6107-1-michal_atlas@posteo.net>
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
next prev parent reply other threads:[~2022-06-15 11:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae8d77255602d71ecc3ee958a086bde12caa6709.camel@ist.tugraz.at \
--to=liliana.prikler@ist.tugraz.at \
--cc=55920@debbugs.gnu.org \
--cc=michal_atlas@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).