From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 61949-done@debbugs.gnu.org, Christopher Baines <mail@cbaines.net>,
Simon Tournier <zimon.toutoune@gmail.com>,
Mathieu Othacehe <othacehe@gnu.org>,
Tobias Geerinckx-Rice <me@tobias.gr>,
Josselin Poiret <dev@jpoiret.xyz>,
Ricardo Wurmus <rekado@elephly.net>
Subject: bug#61949: [PATCH] pack: Move common build code to (guix build pack).
Date: Tue, 18 Jul 2023 17:13:44 -0400 [thread overview]
Message-ID: <87bkg8udmf.fsf@gmail.com> (raw)
In-Reply-To: <87y1jxqs10.fsf_-_@gnu.org> ("Ludovic Courtès"'s message of "Mon, 03 Jul 2023 11:10:51 +0200")
Hi Ludo!
Ludovic Courtès <ludo@gnu.org> writes:
> Hi Maxim and all,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> The rationale is to reduce the number of derivations built per pack to ideally
>> one, to minimize storage requirements. The number of derivations had gone up
>> with 68380db4 ("pack: Extract populate-profile-root from
>> self-contained-tarball/builder.") as a side effect to improving code reuse.
>>
>> * guix/scripts/pack.scm (guix): Add commentary comment.
>> (populate-profile-root, self-contained-tarball/builder): Extract to...
>> * guix/build/pack.scm (populate-profile-root): ... this, and...
>> (build-self-contained-tarball): ... that, adjusting for use on the build side.
>> (assert-utf8-locale): New procedure.
>> (self-contained-tarball, debian-archive, rpm-archive): Adjust accordingly.
>
> Sorry for dropping the ball!
Thanks for picking it up again :-)
[...]
>> (gexp->derivation (string-append name ".tar"
>> (compressor-extension compressor))
>> - (self-contained-tarball/builder profile
>> - #:profile-name profile-name
>> - #:target target
>> - #:localstatedir? localstatedir?
>> - #:deduplicate? deduplicate?
>> - #:symlinks symlinks
>> - #:compressor compressor
>> - #:archiver archiver)))
>> + (with-extensions (list guile-gcrypt)
>> + (with-imported-modules `(((guix config) => ,(make-config.scm))
>
> You can remove (guix config) here since it’s unused.
Done.
>> + ,@(source-module-closure
>> + `((guix build pack)
>> + (guix build utils))
>> + #:select? not-config?))
>
> I figured that, to allow tests to run without an external store, we need
> to change it like this:
>
> (gexp->derivation (string-append name ".tar"
> (compressor-extension compressor))
> (with-extensions (if deduplicate? (list guile-gcrypt) '())
> (with-imported-modules (let ((lst (source-module-closure
> `((guix build pack)
> (guix build utils))
> #:select? not-config?)))
> (if deduplicate?
> lst
> (delete '(guix store deduplication) lst)))
> #~(begin
> (use-modules (guix build pack)
> (guix build utils))
> …))))
>
> Quite some boilerplate given that #:deduplicate? is always #f in practice.
> So maybe it’s not worth the trouble, after all.
>
> I’ll let you rebase and adjust as you see fit, but it LGTM!
Thanks for this! I had to use it for tests/guix-pack.sh to pass, but it
still would work for the first test in tests/pack.scm (after modifying
it to use the test store as it used to), so I've left tests/pack.scm
The change is now installed, thanks for the review!
--
Thanks,
Maxim
prev parent reply other threads:[~2023-07-18 21:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-04 3:15 [bug#61949] [PATCH] pack: Move common build code to (guix build pack) Maxim Cournoyer
2023-03-06 15:47 ` Ludovic Courtès
2023-03-06 19:13 ` Maxim Cournoyer
2023-03-06 19:14 ` [bug#61949] [PATCH v2] " Maxim Cournoyer
2023-07-03 9:10 ` [bug#61949] [PATCH] " Ludovic Courtès
2023-07-18 21:13 ` Maxim Cournoyer [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bkg8udmf.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=61949-done@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=ludo@gnu.org \
--cc=mail@cbaines.net \
--cc=me@tobias.gr \
--cc=othacehe@gnu.org \
--cc=rekado@elephly.net \
--cc=zimon.toutoune@gmail.com \
/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 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.