From: Xinglu Chen <public@yoctocell.xyz>
To: Oleg Pykhalov <go.wigust@gmail.com>
Cc: "Ludovic Courtès" <ludo@gnu.org>,
50873@debbugs.gnu.org, "Andrew Tropin" <andrew@trop.in>
Subject: [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’
Date: Fri, 29 Oct 2021 15:47:51 +0200 [thread overview]
Message-ID: <87sfwk7xiw.fsf@disroot.org> (raw)
In-Reply-To: <87mtnf1zt0.fsf_-_@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4829 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
next prev parent reply other threads:[~2021-10-29 13:49 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 17:33 [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Xinglu Chen
2021-09-28 17:35 ` [bug#50873] [PATCH 1/5] guix home: import: Make the user to specify a destination directory Xinglu Chen
2021-09-28 17:35 ` [bug#50873] [PATCH 2/5] guix home: import: Allow multiple modules to be imported for each service Xinglu Chen
2021-09-28 17:35 ` [bug#50873] [PATCH 3/5] guix home: import: Fix module name for Bash service Xinglu Chen
2021-09-28 17:36 ` [bug#50873] [PATCH 4/5] guix home: import: Delete duplicate modules when importing Xinglu Chen
2021-09-28 17:36 ` [bug#50873] [PATCH 5/5] doc: Document the ‘guix home import’ subcommand Xinglu Chen
2021-09-30 7:08 ` Andrew Tropin
2021-10-01 5:08 ` Xinglu Chen
2021-10-02 15:10 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-09-28 20:52 ` [bug#50873] [PATCH 0/2] Add pn Antero Mejr via Guix-patches via
2021-09-28 20:52 ` [bug#50873] [PATCH 1/2] gnu: Add libphonenumber Antero Mejr via Guix-patches via
2021-09-28 20:52 ` [bug#50873] [PATCH 2/2] gnu: Add pn Antero Mejr via Guix-patches via
2021-10-02 15:13 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-10-02 18:45 ` Xinglu Chen
2021-10-10 10:19 ` [bug#50873] [PATCH 0/7] " Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 1/7] guix home: import: Make the user to specify a destination directory Xinglu Chen
2021-10-13 9:24 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-10-29 13:37 ` Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 2/7] guix home: import: Allow multiple modules to be imported for each service Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 3/7] guix home: import: Fix module name for Bash service Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 4/7] guix home: import: Don’t use 'slurp-file-gexp' Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 5/7] guix home: import: Delete duplicate modules when importing Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 6/7] doc: Document the ‘guix home import’ subcommand Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 7/7] Add tests for ‘guix home import’ Xinglu Chen
2021-10-11 13:00 ` [bug#50873] [PATCH 0/5] Fixes to " Oleg Pykhalov
2021-10-13 9:25 ` Ludovic Courtès
2021-10-29 7:36 ` Ludovic Courtès
2021-10-29 13:47 ` Xinglu Chen [this message]
2021-10-30 14:17 ` Ludovic Courtès
2021-10-30 10:42 ` [bug#50873] [PATCH v3 0/8] " Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 1/8] guix home: import: Make the user to specify a destination directory Xinglu Chen
2021-10-30 14:22 ` Liliana Marie Prikler
2021-10-30 10:42 ` [bug#50873] [PATCH v3 2/8] guix home: import: Allow multiple modules to be imported for each service Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 3/8] guix home: import: Fix module name for Bash service Xinglu Chen
2021-10-30 11:50 ` Julien Lepiller
2021-10-30 10:42 ` [bug#50873] [PATCH v3 4/8] guix home: import: Don’t use 'slurp-file-gexp' Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 5/8] guix home: import: Delete duplicate modules when importing Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 6/8] doc: Document the ‘guix home import’ subcommand Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 7/8] Add tests for ‘guix home import’ Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 8/8] guix home: import: Call ‘local-file’ with ‘name’ Xinglu Chen
2021-10-30 23:01 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-10-31 17:38 ` Xinglu Chen
2021-11-01 6:31 ` Andrew Tropin
2021-11-06 17:00 ` Ludovic Courtès
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=87sfwk7xiw.fsf@disroot.org \
--to=public@yoctocell.xyz \
--cc=50873@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=go.wigust@gmail.com \
--cc=ludo@gnu.org \
/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).