[bug#50873] [PATCH 0/5] Fixes to ‘guix home import’

[Xinglu Chen]

On Mon, Oct 11 2021, Oleg Pykhalov wrote:

> Hi,
>
> Xinglu Chen <public@yoctocell.xyz> writes:
>
> […]
>
>> +;; Helpers for checking and generating home environments.
>> +
>> +(%destination-directory "/tmp/guix-config")
>> +(mkdir-p (%destination-directory))
>> +
>> +(define %temporary-home-directory "/tmp/guix-home-import-test")
>
> Better use temporary directory like in tests/opam.scm.
>
> --8<---------------cut here---------------start------------->8---
> (define-module ...
>   #:use-module ((guix build syscalls) #:select (mkdtemp!))
>   ...)
>
> (mkdtemp! "/tmp/guix-home-import-test.XXXXXX")
> --8<---------------cut here---------------end--------------->8---

Good idea.  Out of curiosity: is there any difference between ‘mkdtemp!’
and ‘mkdtemp’ that’s part of Guile?

>> +
>> +(define-syntax-rule (define-home-environment-matcher name pattern)
>> +  (define (name obj)
>> +    (match obj
>> +      (pattern #t)
>> +      (x (pk 'fail x #f)))))
>> +
>> +(define (create-temporary-home files-alist)
>> +  "Create a temporary home directory in '%temporary-home-directory'.
>> +FILES-ALIST is an association list of files and the content of the
>> +corresponding file."
>> +  (define (create-file file content)
>> +    (let ((absolute-path (string-append %temporary-home-directory "/" 
>> file)))
>> +      (unless (file-exists? absolute-path)
>> +        (mkdir-p (pk (dirname absolute-path))))
>> +      (call-with-output-file (pk absolute-path)
>> +        (cut display content <>))))
>
> Do we need those 'pk' calls?

Nope, just some leftover stuff that I forgot to remove…

>> +(define-home-environment-matcher match-home-environment-bash-service
>> +  ('begin
>> +    ('use-modules
>> +     ('gnu 'home)
>> +     ('gnu 'packages)
>> +     ('gnu 'home 'services 'shells))
>> +    ('home-environment
>> +     ('packages
>> +      ('map 'specification->package
>> +            ('list)))
>> +     ('services
>> +      ('list ('service
>> +              'home-bash-service-type
>> +              ('home-bash-configuration
>> +               ('bashrc
>> +                ('list ('local-file "/tmp/guix-config/.bashrc"))))))))))
>
> We should use '%temporary-home-directory' if we use 'mkdtemp!'.

I don’t think so, the ‘bashrc’ file will be copied _from_
‘%temporary-home-directory’ to ‘%destination-directory’, so this should
be ‘%destination-directory’.

>> +
>> +(test-assert "manifest->code: No services"
>> +  (eval-test-with-home-environment
>> +   '()
>> +   (make-manifest (list guile-2.0.9 gcc glibc))
>> +   match-home-environment-no-services))
>> +
>> +(test-assert "manifest->code: No packages nor services"
>> +  (eval-test-with-home-environment
>> +   '()
>> +   (make-manifest '())
>> +   match-home-environment-no-services-nor-packages))
>> +
>> +(test-assert "manifest->code: Bash service"
>> +  (eval-test-with-home-environment
>> +   '((".bashrc" . "echo 'hello guix'"))
>> +   (make-manifest '())
>> +   match-home-environment-bash-service))
>> +
>> +(test-end "home-import")
>
> I tried to use 'guix home import /tmp/foo', where '/tmp/foo' is an empty
> directory.  Then a pasted the generated code to '/tmp/foo/home.scm'
> file.
>
> --8<---------------cut here---------------start------------->8---
> oleg@guixsd ~/src/guix [env]$ ./pre-inst-env guix home build /tmp/foo/home.scm
> /tmp/foo/home.scm:487:11: error: service: unbound variable
> hint: Did you forget `(use-modules (gnu services))'?
> --8<---------------cut here---------------end--------------->8---
>
> OK, added missing (use-modules (gnu services)).
>
> --8<---------------cut here---------------start------------->8---
> oleg@guixsd ~/src/guix [env]$ ./pre-inst-env guix home build /tmp/foo/home.scm
> /tmp/foo/home.scm:491:29: error: local-file: unbound variable
> hint: Did you forget `(use-modules (guix gexp))'?
> --8<---------------cut here---------------end--------------->8---
>
> OK, added missing (use-modules (guix gexp))
>
> --8<---------------cut here---------------start------------->8---
> oleg@guixsd ~/src/guix [env]$
> oleg@guixsd ~/src/guix [env]$ ./pre-inst-env guix home build /tmp/foo/home.scm
> guix home: error: invalid name: `.bashrc'
> --8<---------------cut here---------------end--------------->8---
>
> Now, I need to rename .bashrc to dot-bashrc and .bash_profile to
> dot-bash_profile.  Maybe we should save all dot file with a 'dot-'
> prefix by default?

Ah, thanks for catching this!  I think it would be better to call
‘local-file’ with the optional ‘name’ argument like this:

  (local-file "/some/path/.bashrc" "bashrc")

That also means that the “/some/path/” part won’t end up as part of the
/gnu/store/… file name.

signature.asc
Description: PGP signature