bug#70111: Gnome 44: Dark Theme not Working

[Maxim Cournoyer]

Hi,

Dariqq  writes:

[...]

> Some results from searching online suggest to install
> xdg-desktop-portal and adding that to the system profile and rebooting
> indeed makes the dark setting work as expected.
>
> Should this be handled by the gnome-desktop-service-type, i.e. added
> by one of the gnome-meta-packages (probably gnome-essential-extras)?

A solution along these lines sound reasonable to me.  I think switching
to the dark theme should work out of the box if it's exposed in the UI.

-- 
Thanks,
Maxim

bug#41602: texlive-texmf is actually subtitutable

[Maxim Cournoyer]

Hello,

Ludovic Courtès  writes:

> Hi,
>
> Leo Famulari  skribis:
>
>> On Fri, May 29, 2020 at 05:15:40PM +0200, Ludovic Courtès wrote:
>>> The info suggests it won’t be substituted, but it’s eventually
>>> substituted.  I wonder why, because the .drv has:
>>> 
>>>   ("allowSubstitutes","0")
>>> 
>>> and the daemon has:
>>> 
>>>   bool substitutesAllowed(const Derivation & drv)
>>>   {
>>>   return get(drv.env, "allowSubstitutes", "1") == "1";
>>>   }
>>> 
>>> and:
>>> 
>>>   if (settings.useSubstitutes && substitutesAllowed(drv))
>>>   foreach (PathSet::iterator, i, invalidOutputs)
>>>   addWaitee(worker.makeSubstitutionGoal(*i, buildMode == bmRepair));
>>> 
>>> Thoughts?
>>
>> I wonder if the content-addressed fallbacks take a different code path
>> that doesn't respect "allowSubstitutes"?
>
> It does, but this texlive-texmf.drv is not a fixed-output derivation.

I just verified; this still happens:

--8<---cut here---start->8---
$ guix build texlive -n
substitute: mise à jour des substituts depuis « https://ci.guix.gnu.org »... 
100.0 %
La dérivation suivante serait compilée :
  /gnu/store/ym96pipknrh6khzc3ws8ychiy6224y61-texlivetexmf-20230313.drv
3 880,6 Mo seraient téléchargés :
  /gnu/store/rzczwmmkvpkahy0mgpahav0yx37ci61b-texlive-20230313-texmf.tar.xz
  /gnu/store/bcc5071mvprhp4yj1jimlhyyi499d2ba-texlivebin-20230313
  /gnu/store/bd4mzanvv7q2plm2b6zld8cz3fy0x34a-texlive-20230313
maxim@hurd ~/src/guix [env]$ guix build 
/gnu/store/bd4mzanvv7q2plm2b6zld8cz3fy0x34a-texlive-20230313
substitute: mise à jour des substituts depuis « https://ci.guix.gnu.org »... 
100.0 %
substitution de 
/gnu/store/bcc5071mvprhp4yj1jimlhyyi499d2ba-texlivebin-20230313...
téléchargement depuis 
https://ci.guix.gnu.org/nar/lzip/bcc5071mvprhp4yj1jimlhyyi499d2ba-texlivebin-20230313...
 texlivebin-20230313  13.5MiB   527KiB/s 00:26 
▕██▏ 100.0%

substitution de 
/gnu/store/4hr3i6p7g2miwhy9gn64mxp1haix36dq-texlivetexmf-20230313...
téléchargement depuis 
https://ci.guix.gnu.org/nar/lzip/4hr3i6p7g2miwhy9gn64mxp1haix36dq-texlivetexmf-20230313...
 texlivetexmf-20230313  3.63GiB 360KiB/s 00:17 
▕  ▏   0.2%^C
--8<---cut here---end--->8---

-- 
Thanks,
Maxim

bug#70140: Missing ./doc/guix-cookbook.pt_BR.texi

[Rostislav Svoboda]

> Rerun ./bootstrap and configure, then make

Yeap that helped. Thank you Efraim.

BTW there's a corresponding comment in the doc/local.mk which could be improved:

modified   doc/local.mk
@@ -21,7 +21,8 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Guix.  If not, see .

-# If adding a language, update the following variables, and info_TEXINFOS.
+# If adding a language, update the following variables, and info_TEXINFOS and
+# rerun ./configure

And while at it, also the manual
https://guix.gnu.org/manual/devel/en/html_node/Writing-Documentation.html:

modified   doc/contributing.texi
@@ -2737,9 +2737,9 @@ Writing Documentation
 @xref{Translating Guix} for more information.

 To render documentation, you must first make sure that you ran
-@command{./configure} in your source tree (@pxref{Running Guix Before
-It Is Installed}).  After that you can run one of the following
-commands:
+@command{./configure} in your source tree (@pxref{Running Guix Before It
+Is Installed}).  This step must be done when adding a new language, too.
+After that you can run one of the following commands:


What do you think, should we patch these files?

Cheers Bost

bug#39650: wish: search shows whether a package is installed

[Adam Porter]

Hi,

FYI, I just filed bug#70153, which is related, about the "guix show" / 
"guix package --show" command.


https://issues.guix.gnu.org/70153

--Adam

bug#70153: Command "guix show PACKAGE" should also show installed version

[Adam Porter]

Hi,

It would be very helpful if the command "guix show PACKAGE" (aka "guix 
package --show=PACKAGE") showed the version of the package that is 
currently installed, if any.


For example, the version of "emacs" in Guix is currently 29.3, and the 
version I have installed is 29.1.  When I run "guix show emacs" I get:


  name: emacs
  version: 29.3
  outputs: ...

If I didn't know better, I might think that I had version 29.3 
installed.  Instead, to check what version is actually installed, I have 
to run "guix package --list-installed=emacs" to see:


  emacs   29.1out 
/gnu/store/9i6p8jsvgrsradmbqa7iixk61gd00k2g-emacs-29.1


This makes the common operation of comparing the currently installed 
version of a package with the currently available version require two 
commands instead of one.


In contrast, e.g. in Debian, one can run "apt-cache policy PACKAGE" to 
see output like:


  PACKAGE:
Installed: X.Y-1~deb11u1
Candidate: X.Y-1~deb11u1

Which makes it easy to compare them.

Thanks for your work on Guix.

--Adam

bug#70051: system hangs at boot - LUKS /home/ problem(?)

[Remco van 't Veer]

2024/04/02, Benjamin Slade:

> I can't roll back to the earlier commit mentioned by Remco because
> other things/channels depend on me being roughly up-to-date on the
> main guix channel.

Reverting the commit on a local checkout of guix worked for me but isn't
workable of course.  I tested the patch provided by aurtzy
(https://issues.guix.gnu.org/70051#5) and that worked worked too.

For now I won't reconfigure my system until this issue is fixed or try
out "guix pull --switch-generation" to go back to some earlier situation
when I really need to deploy some configuration change.

Remco

bug#70140: Missing ./doc/guix-cookbook.pt_BR.texi

[Efraim Flashner]

Rerun ./bootstrap and configure, then make

On Tue, Apr 02, 2024 at 03:59:36PM +0200, Rostislav Svoboda wrote:
> $ guix shell --development guix direnv gnupg --pure --
> bost@ecke ~/dev/guix [env]$ make doc/guix.texi
>  cd . && /bin/sh /home/bost/dev/guix/build-aux/missing automake-1.16
> --gnu Makefile
> Makefile.am:922: warning: AM_GNU_GETTEXT used but 'po' not in SUBDIRS
> automake-1.16: error: cannot open < ./doc/guix-cookbook.pt_BR.texi: No
> such file or directory
> make: *** [Makefile:4349: Makefile.in] Error 1
> 
> And I think it is caused by:
> 
> $ git show --format=medium fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5 
> doc/local.mk
> commit fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5
> Author: Florian Pelz 
> Date:   Mon Apr 1 00:54:32 2024
> 
> nls: Update translations.
> 
> * po/guix/ar.po: New file.
> * po/guix/LINGUAS: Add 'ar'.
> * po/doc/guix-cookbook.pt_BR.po: New file.
> * po/doc/local.mk: Add 'pt_BR' cookbook.
> * doc/local.mk: Add 'pt_BR' cookbook.
> * doc/htmlxref.cnf: Update URLs for cookbook.
> * doc/build.scm (%cookbook-languages): Add 'ko', 'pt_BR'.
> * doc/guix-cookbook.texi (Top): Mention 'ko', 'pt_BR' cookbook.
> 
> Change-Id: Id1846ca100263b3fc1fa2ed52654c670270ee809
> 
> diff --git a/doc/local.mk b/doc/local.mk
> index 97f0c3a92a..0ff317a19e 100644
> --- a/doc/local.mk
> +++ b/doc/local.mk
> @@ -23,7 +23,7 @@
> 
>  # If adding a language, update the following variables, and info_TEXINFOS.
>  MANUAL_LANGUAGES = de es fr pt_BR ru zh_CN
> -COOKBOOK_LANGUAGES = de fr ko sk
> +COOKBOOK_LANGUAGES = de fr ko pt_BR sk
> 
>  # Arg1: A list of languages codes.
>  # Arg2: The file name stem.
> @@ -42,6 +42,7 @@ info_TEXINFOS = %D%/guix.texi \
>%D%/guix-cookbook.de.texi\
>%D%/guix-cookbook.fr.texi\
>%D%/guix-cookbook.ko.texi\
> +  %D%/guix-cookbook.pt_BR.texi \
>%D%/guix-cookbook.sk.texi
> 
>  %C%_guix_TEXINFOS = \
> 
> 
> 

-- 
Efraim Flashner  רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


signature.asc
Description: PGP signature

bug#70143: emacs-sly-named-readtables doesn't build

[Rostislav Svoboda]

I guess it has something to do with the:
1. 72ca1a336ab296187a4d025c399fade63004c780 : Merge branch 'emacs-team'
2. ungexp'y-like `#$` in `(file-name-directory #$)` in the
sly-named-readtables-autoloads.el

$ guix shell --development guix direnv gnupg git --pure
bost@ecke ~/dev/guix [env]$ ./pre-inst-env guix build --cores=24
--keep-failed emacs-sly-named-readtables
[bunch of warnings
;;; note: source file *.scm
;;;   newer than compiled *.go
]
The following derivation will be built:
  
/gnu/store/lg72fi98c721fvfqqly4r40qqn6i9dr4-emacs-sly-named-readtables-0.1-1.a5a4267.drv
building 
/gnu/store/lg72fi98c721fvfqqly4r40qqn6i9dr4-emacs-sly-named-readtables-0.1-1.a5a4267.drv...
WARNING: (guile-user): imported module (guix build utils) overrides
core binding `delete'
starting phase `set-SOURCE-DATE-EPOCH'
phase `set-SOURCE-DATE-EPOCH' succeeded after 0.0 seconds
starting phase `set-paths'
environment variable `PATH' set to
`/gnu/store/sxy0m2kafl8aznf5l40j77lms7805v07-emacs-minimal-29.3/bin:/gnu/store/sxx22f98vfbavcqmdksm6as8fvskpxiw-tar-1.34/bin:/gnu/store/x24bm49ag5dvki72mjdz195bfb89nrnb-gzip-1.12/bin:/gnu/store/j8wlfmlmfvpbza6is9wv9xsd8psrxn00-bzip2-1.0.8/bin:/gnu/store/gr0sy0m1mv36qv54idm6cn10l3mngshq-file-5.44/bin:/gnu/store/zmcf5kpqiighkbh7wslf91qdjwj06yr1-diffutils-3.8/bin:/gnu/store/210yfax18r2g2inxrml9435ikhfcca6m-patch-2.7.6/bin:/gnu/store/c8jyph2lxw0m9na34fg8h70n4nnnz7is-findutils-4.9.0/bin:/gnu/store/hc05d76f1j3iz3v2bs5jz4fpljl1r4dj-gawk-5.2.1/bin:/gnu/store/xxcfsimvxz7z4dj593gnqbkzc6picwzq-sed-4.8/bin:/gnu/store/yrv5f70mn83a876b78i5s79dd2hsh0zf-grep-3.8/bin:/gnu/store/6k1yys9wqrfn4y41ic1win8gpnimncwj-xz-5.2.8/bin:/gnu/store/a5i8avx826brw5grn3n4qv40g514505c-coreutils-9.1/bin:/gnu/store/wj7casda7rb55rvqjnpm0bm7a2zm6618-make-4.3/bin:/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin:/gnu/store/na1dpbbcxjaa3n8wkwrfpch476f90hlf-ld-wrapper-0/bin:/gnu/store/zh4x65snfis7svs6906gj1z8i7dx2j3m-binutils-2.38/bin:/gnu/store/5lqhcv91ijy82p92ac6g5xw48l0lwwz4-gcc-11.3.0/bin:/gnu/store/gsjczqir1wbz8p770zndrpw4rnppmxi3-glibc-2.35/bin:/gnu/store/gsjczqir1wbz8p770zndrpw4rnppmxi3-glibc-2.35/sbin'
environment variable `EMACSLOADPATH' set to
`/gnu/store/sxy0m2kafl8aznf5l40j77lms7805v07-emacs-minimal-29.3/share/emacs/site-lisp:/gnu/store/q5dbiqr6f4v8zdkqsrn75ipids809d8l-emacs-sly-1.0.43-9.9c43bf6/share/emacs/site-lisp'
environment variable `EMACSNATIVELOADPATH' unset
environment variable `INFOPATH' set to
`/gnu/store/sxy0m2kafl8aznf5l40j77lms7805v07-emacs-minimal-29.3/share/info:/gnu/store/q5dbiqr6f4v8zdkqsrn75ipids809d8l-emacs-sly-1.0.43-9.9c43bf6/share/info:/gnu/store/sxx22f98vfbavcqmdksm6as8fvskpxiw-tar-1.34/share/info:/gnu/store/x24bm49ag5dvki72mjdz195bfb89nrnb-gzip-1.12/share/info:/gnu/store/zmcf5kpqiighkbh7wslf91qdjwj06yr1-diffutils-3.8/share/info:/gnu/store/c8jyph2lxw0m9na34fg8h70n4nnnz7is-findutils-4.9.0/share/info:/gnu/store/hc05d76f1j3iz3v2bs5jz4fpljl1r4dj-gawk-5.2.1/share/info:/gnu/store/xxcfsimvxz7z4dj593gnqbkzc6picwzq-sed-4.8/share/info:/gnu/store/yrv5f70mn83a876b78i5s79dd2hsh0zf-grep-3.8/share/info:/gnu/store/a5i8avx826brw5grn3n4qv40g514505c-coreutils-9.1/share/info:/gnu/store/wj7casda7rb55rvqjnpm0bm7a2zm6618-make-4.3/share/info:/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/share/info:/gnu/store/zh4x65snfis7svs6906gj1z8i7dx2j3m-binutils-2.38/share/info:/gnu/store/5lqhcv91ijy82p92ac6g5xw48l0lwwz4-gcc-11.3.0/share/info:/gnu/store/gsjczqir1wbz8p770zndrpw4rnppmxi3-glibc-2.35/share/info'
environment variable `TREE_SITTER_GRAMMAR_PATH' unset
environment variable `BASH_LOADABLES_PATH' unset
environment variable `C_INCLUDE_PATH' set to
`/gnu/store/sxy0m2kafl8aznf5l40j77lms7805v07-emacs-minimal-29.3/include:/gnu/store/j8wlfmlmfvpbza6is9wv9xsd8psrxn00-bzip2-1.0.8/include:/gnu/store/gr0sy0m1mv36qv54idm6cn10l3mngshq-file-5.44/include:/gnu/store/hc05d76f1j3iz3v2bs5jz4fpljl1r4dj-gawk-5.2.1/include:/gnu/store/6k1yys9wqrfn4y41ic1win8gpnimncwj-xz-5.2.8/include:/gnu/store/wj7casda7rb55rvqjnpm0bm7a2zm6618-make-4.3/include:/gnu/store/zh4x65snfis7svs6906gj1z8i7dx2j3m-binutils-2.38/include:/gnu/store/5lqhcv91ijy82p92ac6g5xw48l0lwwz4-gcc-11.3.0/include:/gnu/store/gsjczqir1wbz8p770zndrpw4rnppmxi3-glibc-2.35/include:/gnu/store/5iklcps70c0sfkxvlrhg8jhf3q4h18bj-linux-libre-headers-5.15.49/include'
environment variable `CPLUS_INCLUDE_PATH' set to

bug#69996: Broken OCaml packages (e.g. frama-c and binsec)

[Julien Lepiller]

At least for Frama-C, the issue is environment variables. It requires OCAMLPATH 
to work correctly. So this works:

guix shell frama-c ocaml -- frama-c

Even though the compiler is not needed.

It's another example of why we should propagate search paths, although we could 
also redefine the same search path in packages that need it ;)

Le 25 mars 2024 11:29:44 GMT+01:00, pukkamustard  a 
écrit :
>
>As reported by Arnaud (off-list mail) some OCaml packages build fine but
>seem to be broken.
>
>Examples include `frama-c` and `binsec`:
>
>```
>guix shell frama-c -- frama-c
>[kernel] Current source was: :0
>  The full backtrace is:
>  Raised at Dune_site_plugins__Plugins.lookup_and_summarize.loop.(fun) in file 
> "otherlibs/dune-site/src/plugins/plugins.ml", line 237, characters 16-87
>  Called from Dune_site_plugins__Plugins.load_gen in file 
> "otherlibs/dune-site/src/plugins/plugins.ml", line 263, characters 39-69
>  Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15
>  Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15
>  Called from Frama_c_kernel__Kernel.bootstrap_loader in file 
> "src/kernel_services/plugin_entry_points/kernel.ml", line 933, characters 
> 35-62
>  Called from Frama_c_kernel__Cmdline.parse_and_boot in file 
> "src/kernel_services/cmdline_parameters/cmdline.ml", line 894, characters 2-22
>  Called from Frama_c_kernel__Cmdline.catch_toplevel_run in file 
> "src/kernel_services/cmdline_parameters/cmdline.ml", line 233, characters 4-8
>  
>  Unexpected error (The library "frama-c-aorai.core" can't be found in the 
> search paths "/gnu/store/psmc4940aa9bj23dddkglv0p2yhi05kn-ocaml-4.14.1/lib".).
>  Please report as 'crash' at https://git.frama-c.com/pub/frama-c/issues
>  Your Frama-C version is 27.1 (Cobalt).
>  Note that a version and a backtrace alone often do not contain enough
>  information to understand the bug. Guidelines for reporting bugs are at:
>  https://git.frama-c.com/pub/frama-c/-/wikis/Guidelines-for-reporting-bugs
>```
>
>```
>guix shell binsec -- binsec -v
>Fatal error: exception The library "binsec.sse.checkct" can't be found in the 
>search paths "/gnu/store/psmc4940aa9bj23dddkglv0p2yhi05kn-ocaml-4.14.1/lib".
>```
>
>
>

bug#70140: Missing ./doc/guix-cookbook.pt_BR.texi

[Rostislav Svoboda]

$ guix shell --development guix direnv gnupg --pure --
bost@ecke ~/dev/guix [env]$ make doc/guix.texi
 cd . && /bin/sh /home/bost/dev/guix/build-aux/missing automake-1.16
--gnu Makefile
Makefile.am:922: warning: AM_GNU_GETTEXT used but 'po' not in SUBDIRS
automake-1.16: error: cannot open < ./doc/guix-cookbook.pt_BR.texi: No
such file or directory
make: *** [Makefile:4349: Makefile.in] Error 1

And I think it is caused by:

$ git show --format=medium fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5 doc/local.mk
commit fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5
Author: Florian Pelz 
Date:   Mon Apr 1 00:54:32 2024

nls: Update translations.

* po/guix/ar.po: New file.
* po/guix/LINGUAS: Add 'ar'.
* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add 'pt_BR' cookbook.
* doc/local.mk: Add 'pt_BR' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'ko', 'pt_BR'.
* doc/guix-cookbook.texi (Top): Mention 'ko', 'pt_BR' cookbook.

Change-Id: Id1846ca100263b3fc1fa2ed52654c670270ee809

diff --git a/doc/local.mk b/doc/local.mk
index 97f0c3a92a..0ff317a19e 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -23,7 +23,7 @@

 # If adding a language, update the following variables, and info_TEXINFOS.
 MANUAL_LANGUAGES = de es fr pt_BR ru zh_CN
-COOKBOOK_LANGUAGES = de fr ko sk
+COOKBOOK_LANGUAGES = de fr ko pt_BR sk

 # Arg1: A list of languages codes.
 # Arg2: The file name stem.
@@ -42,6 +42,7 @@ info_TEXINFOS = %D%/guix.texi \
   %D%/guix-cookbook.de.texi\
   %D%/guix-cookbook.fr.texi\
   %D%/guix-cookbook.ko.texi\
+  %D%/guix-cookbook.pt_BR.texi \
   %D%/guix-cookbook.sk.texi

 %C%_guix_TEXINFOS = \

bug#70051: [PATCH] gnu: open-luks-device: Fix unbound variables.

[Remco van 't Veer]

2024/04/02, aurtzy:

> Can anyone confirm this patch works for them too?

Yes, it does.

Cheers,
Remco

bug#53129: Zathura: Index for epub files only go to show page 1

[Efraim Flashner]

On Fri, Mar 29, 2024 at 03:17:13PM +, Sharlatan Hellseher wrote:
> 
> Hi,
> 
> Is it still relevant for you or it may be closed as resolved?
> The issue can't be reproduced as not commit or version provided.
> 
> Thanks,
> Oleg

I was able to read an epub using zathura and zathura-pdf-mupdf. I read
the first ~160 pages.

-- 
Efraim Flashner  רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


signature.asc
Description: PGP signature

bug#67565: shepherd: FAIL: tests/close-on-exec.sh

[Attila Lendvai]

> > this log file is with my shepherd branch, i.e. it contains much more log.
> 
> 
> Could you check whether it happens with current ‘main’?


i ran a `make check` recently on main, and it ran clean.

it doesn't mean much, though, because it only failed sporadically.

-- 
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“The worst enemy of clear thinking is the propensity to hypostatize, i.e. to 
ascribe substance or real existence to mental constructs or concepts.”
— Ludwig von Mises (1881–1973), 'The Ultimate Foundations of Economic 
Science' (1962)

bug#70051: [PATCH] gnu: open-luks-device: Fix unbound variables.

[aurtzy]

It seems like `use-modules' never actually worked due to the way it is eval'd
by the Shepherd, and was only apparent after a change that prevented other
module imports from leaking into the namespace.  This is fixed by using direct
references instead.

* gnu/system/mapped-devices.scm (open-luks-device): Use direct references for
variables from other modules.

Fixes: https://issues.guix.gnu.org/70051

Change-Id: I993798e161c4b4fca6e8a4f14eea5042b184ebc9
---

Hi!

I encountered this issue as well, and think I've figured out what was
happening: `use-modules' appears to not work due to the way g-expressions are
evaluated by Shepherd, so after services became properly isolated in their own
modules, the variable references became no longer available.  There's a
comment further down in the file that seems to confirm this ("XXX: We're not
at the top level here...").

Can anyone confirm this patch works for them too?

Cheers,

aurtzy

 gnu/system/mapped-devices.scm | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index c19a818453..e46e2c7954 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -201,14 +201,12 @@ (define* (open-luks-device source targets #:key key-file)
#~(let ((source #$(if (uuid? source)
  (uuid-bytevector source)
  source))
-   (keyfile #$key-file))
-   ;; XXX: 'use-modules' should be at the top level.
-   (use-modules (rnrs bytevectors) ;bytevector?
-((gnu build file-systems)
- #:select (find-partition-by-luks-uuid
-   system*/tty))
-((guix build utils) #:select (mkdir-p)))
-
+   (keyfile #$key-file)
+   (bytevector? (@ (rnrs bytevectors) bytevector?))
+   (find-partition-by-luks-uuid (@ (gnu build file-systems)
+   find-partition-by-luks-uuid))
+   (system*/tty (@ (gnu build file-systems) system*/tty))
+   (mkdir-p (@ (guix build utils) mkdir-p)))
;; Create '/run/cryptsetup/' if it does not exist, as device locking
;; is mandatory for LUKS2.
(mkdir-p "/run/cryptsetup/")

base-commit: 6e2db85ca83528199a46b002d2592bd4bef017c8
-- 
2.41.0