all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR
@ 2022-07-25  9:43 Andrew Tropin
  2022-08-01 10:08 ` Ludovic Courtès
  0 siblings, 1 reply; 8+ messages in thread
From: Andrew Tropin @ 2022-07-25  9:43 UTC (permalink / raw)
  To: 56758


[-- Attachment #1.1: Type: text/plain, Size: 279 bytes --]


Andrew Tropin (2):
  home: xdg: Use closures in activation scripts.
  home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.

 gnu/home/services/xdg.scm | 46 ++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

-- 
2.37.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-home-xdg-Use-closures-in-activation-scripts.patch --]
[-- Type: text/x-patch, Size: 3474 bytes --]

From d08ed8de3ead1a704a96e0e6673dffb62f859597 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Thu, 21 Jul 2022 15:24:32 +0300
Subject: [PATCH 1/2] home: xdg: Use closures in activation scripts.

* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation,
home-xdg-user-directories-files-service): Use closures in activation scripts.
---
 gnu/home/services/xdg.scm | 41 ++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 71c028c788..5a41dc4994 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -23,6 +23,7 @@ (define-module (gnu home services xdg)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu home services utils)
   #:use-module (guix gexp)
+  #:use-module (guix modules)
   #:use-module (guix records)
   #:use-module (guix i18n)
   #:use-module (guix diagnostics)
@@ -105,16 +106,17 @@ (define (home-xdg-base-directories-environment-variables-service config)
    home-xdg-base-directories-configuration-fields))
 
 (define (ensure-xdg-base-dirs-on-activation config)
-  #~(map (lambda (xdg-base-dir-variable)
-           ((@@ (guix build utils) mkdir-p)
-            (getenv
-             xdg-base-dir-variable)))
-         '#$(map (lambda (field)
-                   (format
-                    #f "XDG_~a"
-                    (object->snake-case-string
-                     (configuration-field-name field) 'upper)))
-                 home-xdg-base-directories-configuration-fields)))
+  (with-imported-modules '((guix build utils))
+    #~(map (lambda (xdg-base-dir-variable)
+             ((@ (guix build utils) mkdir-p)
+              (getenv
+               xdg-base-dir-variable)))
+           '#$(map (lambda (field)
+                     (format
+                      #f "XDG_~a"
+                      (object->snake-case-string
+                       (configuration-field-name field) 'upper)))
+                   home-xdg-base-directories-configuration-fields))))
 
 (define (last-extension-or-cfg config extensions)
   "Picks configuration value from last provided extension.  If there
@@ -205,14 +207,17 @@ (define (home-xdg-user-directories-activation-service config)
   (let ((dirs (map (lambda (field)
                      ((configuration-field-getter field) config))
                    home-xdg-user-directories-configuration-fields)))
-    #~(let ((ensure-dir
-             (lambda (path)
-               (mkdir-p
-                ((@@ (ice-9 string-fun) string-replace-substring)
-                 path "$HOME" (getenv "HOME"))))))
-        (display "Creating XDG user directories...")
-        (map ensure-dir '#$dirs)
-        (display " done\n"))))
+    (with-imported-modules `((guix build utils)
+                             ,@(source-module-closure
+                                '((ice-9 string-fun))))
+      #~(let ((ensure-dir
+               (lambda (path)
+                 ((@ (guix build utils) mkdir-p)
+                  ((@ (ice-9 string-fun) string-replace-substring)
+                   path "$HOME" (getenv "HOME"))))))
+          (display "Creating XDG user directories...")
+          (map ensure-dir '#$dirs)
+          (display " done\n")))))
 
 (define home-xdg-user-directories-service-type
   (service-type (name 'home-xdg-user-directories)
-- 
2.37.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-home-xdg-Skip-mkdir-XDG_RUNTIME_DIR-in-activation-sc.patch --]
[-- Type: text/x-patch, Size: 1898 bytes --]

From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Thu, 21 Jul 2022 17:06:24 +0300
Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation
 script.

* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
XDG_RUNTIME_DIR in activation script.
---
 gnu/home/services/xdg.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 5a41dc4994..541f64a379 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
   (with-imported-modules '((guix build utils))
     #~(map (lambda (xdg-base-dir-variable)
              ((@ (guix build utils) mkdir-p)
-              (getenv
-               xdg-base-dir-variable)))
-           '#$(map (lambda (field)
-                     (format
-                      #f "XDG_~a"
-                      (object->snake-case-string
-                       (configuration-field-name field) 'upper)))
+              (getenv xdg-base-dir-variable)))
+           '#$(filter-map
+               (lambda (field)
+                 (let ((env-var-name
+                        (format
+                         #f "XDG_~a"
+                         (object->snake-case-string
+                          (configuration-field-name field) 'upper))))
+                   ;; XDG_RUNTIME_DIR shouldn't be created during activation
+                   ;; and will be provided by elogind or other service.
+                   (and (not (string=? "XDG_RUNTIME_DIR" env-var-name))
+                        env-var-name)))
                    home-xdg-base-directories-configuration-fields))))
 
 (define (last-extension-or-cfg config extensions)
-- 
2.37.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR
  2022-07-25  9:43 [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR Andrew Tropin
@ 2022-08-01 10:08 ` Ludovic Courtès
  2022-08-01 12:49   ` Andrew Tropin
  2022-08-02  6:00   ` [bug#56758] [PATCH v2 0/4] " Andrew Tropin
  0 siblings, 2 replies; 8+ messages in thread
From: Ludovic Courtès @ 2022-08-01 10:08 UTC (permalink / raw)
  To: Andrew Tropin; +Cc: 56758

[-- Attachment #1: Type: text/plain, Size: 4863 bytes --]

Hi,

Andrew Tropin <andrew@trop.in> skribis:

> From d08ed8de3ead1a704a96e0e6673dffb62f859597 Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew@trop.in>
> Date: Thu, 21 Jul 2022 15:24:32 +0300
> Subject: [PATCH 1/2] home: xdg: Use closures in activation scripts.
>
> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation,
> home-xdg-user-directories-files-service): Use closures in activation scripts.

[...]

>  (define (ensure-xdg-base-dirs-on-activation config)
> -  #~(map (lambda (xdg-base-dir-variable)
> -           ((@@ (guix build utils) mkdir-p)
> -            (getenv
> -             xdg-base-dir-variable)))
> -         '#$(map (lambda (field)
> -                   (format
> -                    #f "XDG_~a"
> -                    (object->snake-case-string
> -                     (configuration-field-name field) 'upper)))
> -                 home-xdg-base-directories-configuration-fields)))
> +  (with-imported-modules '((guix build utils))
> +    #~(map (lambda (xdg-base-dir-variable)
> +             ((@ (guix build utils) mkdir-p)

This change doesn’t hurt but it’s apparently unnecessary.

> +    (with-imported-modules `((guix build utils)
> +                             ,@(source-module-closure
> +                                '((ice-9 string-fun))))

However this one is incorrect is it would lead (ice-9 string-fun) from
the host Guile to be imported into the build environment, thereby making
the result dependent on the version of Guile that is used “outside” (you
may have seen a warning like “importing (ice-9 string-fun) from the
host”.)

> From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew@trop.in>
> Date: Thu, 21 Jul 2022 17:06:24 +0300
> Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation
>  script.
>
> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
> XDG_RUNTIME_DIR in activation script.
> ---
>  gnu/home/services/xdg.scm | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
> index 5a41dc4994..541f64a379 100644
> --- a/gnu/home/services/xdg.scm
> +++ b/gnu/home/services/xdg.scm
> @@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
>    (with-imported-modules '((guix build utils))
>      #~(map (lambda (xdg-base-dir-variable)
>               ((@ (guix build utils) mkdir-p)
> -              (getenv
> -               xdg-base-dir-variable)))
> -           '#$(map (lambda (field)
> -                     (format
> -                      #f "XDG_~a"
> -                      (object->snake-case-string
> -                       (configuration-field-name field) 'upper)))
> +              (getenv xdg-base-dir-variable)))
> +           '#$(filter-map
> +               (lambda (field)
> +                 (let ((env-var-name
> +                        (format
> +                         #f "XDG_~a"
> +                         (object->snake-case-string
> +                          (configuration-field-name field) 'upper))))
> +                   ;; XDG_RUNTIME_DIR shouldn't be created during activation
> +                   ;; and will be provided by elogind or other service.
> +                   (and (not (string=? "XDG_RUNTIME_DIR" env-var-name))
> +                        env-var-name)))
>                     home-xdg-base-directories-configuration-fields))))
>  
>  (define (last-extension-or-cfg config extensions)

I tweaked that accordingly (patch attached), but that leads to a test
failure in ‘tests/guix-home.sh’ because there’s a warning about
XDG_RUNTIME_DIR not existing that goes to standard output of ‘guix home
container’:

--8<---------------cut here---------------start------------->8---
+ guix home container home.scm -- false
XDG_RUNTIME_DIR doesn't exists, on-first-login script
won't execute anything.  You can check if xdg runtime directory exists,
XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
script by running '$HOME/.guix-home/on-first-login'++ guix home container home.scm -- echo '$HOME'
guix home: warning: only 4.1 GiB of free space available on /gnu/store
hint: Consider deleting old profile generations and collecting garbage, along
these lines:

     guix gc --delete-generations=1m

+ test 'XDG_RUNTIME_DIR doesn'\''t exists, on-first-login script
won'\''t execute anything.  You can check if xdg runtime directory exists,
XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
script by running '\''$HOME/.guix-home/on-first-login'\''/home/ludo' = /home/ludo
--8<---------------cut here---------------end--------------->8---

Thoughts?

Ludo’.


[-- Attachment #2: the modified patch --]
[-- Type: text/x-patch, Size: 1978 bytes --]

From f6ff733aaaea7e5b8277b65430e7dc090dffa9aa Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Thu, 21 Jul 2022 17:06:24 +0300
Subject: [PATCH] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
XDG_RUNTIME_DIR in activation script.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/home/services/xdg.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 71c028c788..0219bc93e0 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -109,12 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
            ((@@ (guix build utils) mkdir-p)
             (getenv
              xdg-base-dir-variable)))
-         '#$(map (lambda (field)
-                   (format
-                    #f "XDG_~a"
-                    (object->snake-case-string
-                     (configuration-field-name field) 'upper)))
-                 home-xdg-base-directories-configuration-fields)))
+         '#$(filter-map
+             (lambda (field)
+               (let ((variable
+                      (string-append
+                       "XDG_"
+                       (object->snake-case-string
+                        (configuration-field-name field) 'upper))))
+                 ;; XDG_RUNTIME_DIR shouldn't be created during activation
+                 ;; and will be provided by elogind or other service.
+                 (and (not (string=? "XDG_RUNTIME_DIR" variable))
+                      variable)))
+             home-xdg-base-directories-configuration-fields)))
 
 (define (last-extension-or-cfg config extensions)
   "Picks configuration value from last provided extension.  If there
-- 
2.37.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR
  2022-08-01 10:08 ` Ludovic Courtès
@ 2022-08-01 12:49   ` Andrew Tropin
  2022-08-01 14:09     ` Andrew Tropin
  2022-08-01 22:12     ` Maxime Devos
  2022-08-02  6:00   ` [bug#56758] [PATCH v2 0/4] " Andrew Tropin
  1 sibling, 2 replies; 8+ messages in thread
From: Andrew Tropin @ 2022-08-01 12:49 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 56758

[-- Attachment #1: Type: text/plain, Size: 8013 bytes --]

On 2022-08-01 12:08, Ludovic Courtès wrote:

> Hi,
>
> Andrew Tropin <andrew@trop.in> skribis:
>
>> From d08ed8de3ead1a704a96e0e6673dffb62f859597 Mon Sep 17 00:00:00 2001
>> From: Andrew Tropin <andrew@trop.in>
>> Date: Thu, 21 Jul 2022 15:24:32 +0300
>> Subject: [PATCH 1/2] home: xdg: Use closures in activation scripts.
>>
>> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation,
>> home-xdg-user-directories-files-service): Use closures in activation scripts.
>
> [...]
>
>>  (define (ensure-xdg-base-dirs-on-activation config)
>> -  #~(map (lambda (xdg-base-dir-variable)
>> -           ((@@ (guix build utils) mkdir-p)
>> -            (getenv
>> -             xdg-base-dir-variable)))
>> -         '#$(map (lambda (field)
>> -                   (format
>> -                    #f "XDG_~a"
>> -                    (object->snake-case-string
>> -                     (configuration-field-name field) 'upper)))
>> -                 home-xdg-base-directories-configuration-fields)))
>> +  (with-imported-modules '((guix build utils))
>> +    #~(map (lambda (xdg-base-dir-variable)
>> +             ((@ (guix build utils) mkdir-p)
>
> This change doesn’t hurt but it’s apparently unnecessary.

At least it removes the usage of @@ :)

>
>> +    (with-imported-modules `((guix build utils)
>> +                             ,@(source-module-closure
>> +                                '((ice-9 string-fun))))
>
> However this one is incorrect as it would lead (ice-9 string-fun) from
> the host Guile to be imported into the build environment, thereby making
> the result dependent on the version of Guile that is used “outside” (you
> may have seen a warning like “importing (ice-9 string-fun) from the
> host”.)

Why so?  I expected modules closure to be compiled on build side and
provided to activation script via preset load-path.

BTW, I don't see this warning.

>
>> From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001
>> From: Andrew Tropin <andrew@trop.in>
>> Date: Thu, 21 Jul 2022 17:06:24 +0300
>> Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation
>>  script.
>>
>> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
>> XDG_RUNTIME_DIR in activation script.
>> ---
>>  gnu/home/services/xdg.scm | 19 ++++++++++++-------
>>  1 file changed, 12 insertions(+), 7 deletions(-)
>>
>> diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
>> index 5a41dc4994..541f64a379 100644
>> --- a/gnu/home/services/xdg.scm
>> +++ b/gnu/home/services/xdg.scm
>> @@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
>>    (with-imported-modules '((guix build utils))
>>      #~(map (lambda (xdg-base-dir-variable)
>>               ((@ (guix build utils) mkdir-p)
>> -              (getenv
>> -               xdg-base-dir-variable)))
>> -           '#$(map (lambda (field)
>> -                     (format
>> -                      #f "XDG_~a"
>> -                      (object->snake-case-string
>> -                       (configuration-field-name field) 'upper)))
>> +              (getenv xdg-base-dir-variable)))
>> +           '#$(filter-map
>> +               (lambda (field)
>> +                 (let ((env-var-name
>> +                        (format
>> +                         #f "XDG_~a"
>> +                         (object->snake-case-string
>> +                          (configuration-field-name field) 'upper))))
>> +                   ;; XDG_RUNTIME_DIR shouldn't be created during activation
>> +                   ;; and will be provided by elogind or other service.
>> +                   (and (not (string=? "XDG_RUNTIME_DIR" env-var-name))
>> +                        env-var-name)))
>>                     home-xdg-base-directories-configuration-fields))))
>>  
>>  (define (last-extension-or-cfg config extensions)
>
> I tweaked that accordingly (patch attached), but that leads to a test
> failure in ‘tests/guix-home.sh’ because there’s a warning about
> XDG_RUNTIME_DIR not existing that goes to standard output of ‘guix home
> container’:
>
> --8<---------------cut here---------------start------------->8---
> + guix home container home.scm -- false
> XDG_RUNTIME_DIR doesn't exists, on-first-login script
> won't execute anything.  You can check if xdg runtime directory exists,
> XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
> script by running '$HOME/.guix-home/on-first-login'++ guix home container home.scm -- echo '$HOME'
> guix home: warning: only 4.1 GiB of free space available on /gnu/store
> hint: Consider deleting old profile generations and collecting garbage, along
> these lines:
>
>      guix gc --delete-generations=1m
>
> + test 'XDG_RUNTIME_DIR doesn'\''t exists, on-first-login script
> won'\''t execute anything.  You can check if xdg runtime directory exists,
> XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
> script by running '\''$HOME/.guix-home/on-first-login'\''/home/ludo' = /home/ludo
> --8<---------------cut here---------------end--------------->8---
>
> Thoughts?

Hm, I tried with both your and my patches, but I don't get a test fail.

--8<---------------cut here---------------start------------->8---
make check TESTS="tests/guix-home.sh"
make  check-recursive
make[1]: Entering directory '/home/bob/work/gnu/guix'
Making check in po/guix
make[2]: Entering directory '/home/bob/work/gnu/guix/po/guix'
make[2]: Nothing to be done for 'check'.
make[2]: Leaving directory '/home/bob/work/gnu/guix/po/guix'
Making check in po/packages
make[2]: Entering directory '/home/bob/work/gnu/guix/po/packages'
make[2]: Nothing to be done for 'check'.
make[2]: Leaving directory '/home/bob/work/gnu/guix/po/packages'
make[2]: Entering directory '/home/bob/work/gnu/guix'
Compiling Scheme modules...
Compiling Scheme modules...
Compiling Scheme modules...
Compiling Scheme modules...
make  check-TESTS check-local
make[3]: Entering directory '/home/bob/work/gnu/guix'
make[4]: Entering directory '/home/bob/work/gnu/guix'
PASS: tests/guix-home.sh
============================================================================
Testsuite summary for GNU Guix 1.3.0.22216-446db
============================================================================
# TOTAL: 1
# PASS:  1
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/home/bob/work/gnu/guix'
make[3]: Nothing to be done for 'check-local'.
make[3]: Leaving directory '/home/bob/work/gnu/guix'
make[2]: Leaving directory '/home/bob/work/gnu/guix'
make[1]: Leaving directory '/home/bob/work/gnu/guix'

Compilation finished at Mon Aug  1 15:42:20
--8<---------------cut here---------------end--------------->8---


The same with guix home container.

--8<---------------cut here---------------start------------->8---
guix home container ~/tmp/he.scm -- false
WARNING: (guile-user): imported module (guix build utils) overrides core binding `delete'
Symlinking /home/bob/.profile -> /gnu/store/dann7r1095xll0kji5yl0ql07096rc8j-shell-profile... done
Symlinking /home/bob/.bash_profile -> /gnu/store/q0i9j1fbxwdr7sqin1hi16zhir8b4qwd-bash_profile... done
Symlinking /home/bob/.bashrc -> /gnu/store/0hblljbzbbrbawhcv2hlz14narb78s2m-bashrc... done
Symlinking /home/bob/.config/fontconfig/fonts.conf -> /gnu/store/4261pxafny0g2myhh9yj1771ry7k05lc-fonts.conf... done
 done
Finished updating symlinks.

Comparing /gnu/store/non-existing-generation/profile/share/fonts and
          /gnu/store/f2bc4zy8hqv3in72yg4kxdxppigfafn1-home/profile/share/fonts... done (same)
Evaluating on-change gexps.

On-change gexps evaluation finished.
--8<---------------cut here---------------end--------------->8---

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR
  2022-08-01 12:49   ` Andrew Tropin
@ 2022-08-01 14:09     ` Andrew Tropin
  2022-08-01 22:12     ` Maxime Devos
  1 sibling, 0 replies; 8+ messages in thread
From: Andrew Tropin @ 2022-08-01 14:09 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 56758

[-- Attachment #1: Type: text/plain, Size: 9095 bytes --]

On 2022-08-01 15:49, Andrew Tropin wrote:

> On 2022-08-01 12:08, Ludovic Courtès wrote:
>
>> Hi,
>>
>> Andrew Tropin <andrew@trop.in> skribis:
>>
>>> From d08ed8de3ead1a704a96e0e6673dffb62f859597 Mon Sep 17 00:00:00 2001
>>> From: Andrew Tropin <andrew@trop.in>
>>> Date: Thu, 21 Jul 2022 15:24:32 +0300
>>> Subject: [PATCH 1/2] home: xdg: Use closures in activation scripts.
>>>
>>> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation,
>>> home-xdg-user-directories-files-service): Use closures in activation scripts.
>>
>> [...]
>>
>>>  (define (ensure-xdg-base-dirs-on-activation config)
>>> -  #~(map (lambda (xdg-base-dir-variable)
>>> -           ((@@ (guix build utils) mkdir-p)
>>> -            (getenv
>>> -             xdg-base-dir-variable)))
>>> -         '#$(map (lambda (field)
>>> -                   (format
>>> -                    #f "XDG_~a"
>>> -                    (object->snake-case-string
>>> -                     (configuration-field-name field) 'upper)))
>>> -                 home-xdg-base-directories-configuration-fields)))
>>> +  (with-imported-modules '((guix build utils))
>>> +    #~(map (lambda (xdg-base-dir-variable)
>>> +             ((@ (guix build utils) mkdir-p)
>>
>> This change doesn’t hurt but it’s apparently unnecessary.
>
> At least it removes the usage of @@ :)
>
>>
>>> +    (with-imported-modules `((guix build utils)
>>> +                             ,@(source-module-closure
>>> +                                '((ice-9 string-fun))))
>>
>> However this one is incorrect as it would lead (ice-9 string-fun) from
>> the host Guile to be imported into the build environment, thereby making
>> the result dependent on the version of Guile that is used “outside” (you
>> may have seen a warning like “importing (ice-9 string-fun) from the
>> host”.)
>
> Why so?  I expected modules closure to be compiled on build side and
> provided to activation script via preset load-path.
>
> BTW, I don't see this warning.
>
>>
>>> From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001
>>> From: Andrew Tropin <andrew@trop.in>
>>> Date: Thu, 21 Jul 2022 17:06:24 +0300
>>> Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation
>>>  script.
>>>
>>> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
>>> XDG_RUNTIME_DIR in activation script.
>>> ---
>>>  gnu/home/services/xdg.scm | 19 ++++++++++++-------
>>>  1 file changed, 12 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
>>> index 5a41dc4994..541f64a379 100644
>>> --- a/gnu/home/services/xdg.scm
>>> +++ b/gnu/home/services/xdg.scm
>>> @@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
>>>    (with-imported-modules '((guix build utils))
>>>      #~(map (lambda (xdg-base-dir-variable)
>>>               ((@ (guix build utils) mkdir-p)
>>> -              (getenv
>>> -               xdg-base-dir-variable)))
>>> -           '#$(map (lambda (field)
>>> -                     (format
>>> -                      #f "XDG_~a"
>>> -                      (object->snake-case-string
>>> -                       (configuration-field-name field) 'upper)))
>>> +              (getenv xdg-base-dir-variable)))
>>> +           '#$(filter-map
>>> +               (lambda (field)
>>> +                 (let ((env-var-name
>>> +                        (format
>>> +                         #f "XDG_~a"
>>> +                         (object->snake-case-string
>>> +                          (configuration-field-name field) 'upper))))
>>> +                   ;; XDG_RUNTIME_DIR shouldn't be created during activation
>>> +                   ;; and will be provided by elogind or other service.
>>> +                   (and (not (string=? "XDG_RUNTIME_DIR" env-var-name))
>>> +                        env-var-name)))
>>>                     home-xdg-base-directories-configuration-fields))))
>>>  
>>>  (define (last-extension-or-cfg config extensions)
>>
>> I tweaked that accordingly (patch attached), but that leads to a test
>> failure in ‘tests/guix-home.sh’ because there’s a warning about
>> XDG_RUNTIME_DIR not existing that goes to standard output of ‘guix home
>> container’:
>>
>> --8<---------------cut here---------------start------------->8---
>> + guix home container home.scm -- false
>> XDG_RUNTIME_DIR doesn't exists, on-first-login script
>> won't execute anything.  You can check if xdg runtime directory exists,
>> XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
>> script by running '$HOME/.guix-home/on-first-login'++ guix home container home.scm -- echo '$HOME'
>> guix home: warning: only 4.1 GiB of free space available on /gnu/store
>> hint: Consider deleting old profile generations and collecting garbage, along
>> these lines:
>>
>>      guix gc --delete-generations=1m
>>
>> + test 'XDG_RUNTIME_DIR doesn'\''t exists, on-first-login script
>> won'\''t execute anything.  You can check if xdg runtime directory exists,
>> XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
>> script by running '\''$HOME/.guix-home/on-first-login'\''/home/ludo' = /home/ludo
>> --8<---------------cut here---------------end--------------->8---
>>
>> Thoughts?
>
> Hm, I tried with both your and my patches, but I don't get a test fail.
>
> --8<---------------cut here---------------start------------->8---
> make check TESTS="tests/guix-home.sh"
> make  check-recursive
> make[1]: Entering directory '/home/bob/work/gnu/guix'
> Making check in po/guix
> make[2]: Entering directory '/home/bob/work/gnu/guix/po/guix'
> make[2]: Nothing to be done for 'check'.
> make[2]: Leaving directory '/home/bob/work/gnu/guix/po/guix'
> Making check in po/packages
> make[2]: Entering directory '/home/bob/work/gnu/guix/po/packages'
> make[2]: Nothing to be done for 'check'.
> make[2]: Leaving directory '/home/bob/work/gnu/guix/po/packages'
> make[2]: Entering directory '/home/bob/work/gnu/guix'
> Compiling Scheme modules...
> Compiling Scheme modules...
> Compiling Scheme modules...
> Compiling Scheme modules...
> make  check-TESTS check-local
> make[3]: Entering directory '/home/bob/work/gnu/guix'
> make[4]: Entering directory '/home/bob/work/gnu/guix'
> PASS: tests/guix-home.sh
> ============================================================================
> Testsuite summary for GNU Guix 1.3.0.22216-446db
> ============================================================================
> # TOTAL: 1
> # PASS:  1
> # SKIP:  0
> # XFAIL: 0
> # FAIL:  0
> # XPASS: 0
> # ERROR: 0
> ============================================================================
> make[4]: Leaving directory '/home/bob/work/gnu/guix'
> make[3]: Nothing to be done for 'check-local'.
> make[3]: Leaving directory '/home/bob/work/gnu/guix'
> make[2]: Leaving directory '/home/bob/work/gnu/guix'
> make[1]: Leaving directory '/home/bob/work/gnu/guix'
>
> Compilation finished at Mon Aug  1 15:42:20
> --8<---------------cut here---------------end--------------->8---
>
>
> The same with guix home container.
>
> --8<---------------cut here---------------start------------->8---
> guix home container ~/tmp/he.scm -- false
> WARNING: (guile-user): imported module (guix build utils) overrides core binding `delete'
> Symlinking /home/bob/.profile -> /gnu/store/dann7r1095xll0kji5yl0ql07096rc8j-shell-profile... done
> Symlinking /home/bob/.bash_profile -> /gnu/store/q0i9j1fbxwdr7sqin1hi16zhir8b4qwd-bash_profile... done
> Symlinking /home/bob/.bashrc -> /gnu/store/0hblljbzbbrbawhcv2hlz14narb78s2m-bashrc... done
> Symlinking /home/bob/.config/fontconfig/fonts.conf -> /gnu/store/4261pxafny0g2myhh9yj1771ry7k05lc-fonts.conf... done
>  done
> Finished updating symlinks.
>
> Comparing /gnu/store/non-existing-generation/profile/share/fonts and
>           /gnu/store/f2bc4zy8hqv3in72yg4kxdxppigfafn1-home/profile/share/fonts... done (same)
> Evaluating on-change gexps.
>
> On-change gexps evaluation finished.
> --8<---------------cut here---------------end--------------->8---

Ok, I found the problem. guix container uses hosts $SHELL variable,
which in my case is zsh and this makes the shell inside container not to
source ~/.profile, so on-first-login isn't executed.

I was able to reproduce test fail and message inside container.

My thoughts:
1. home container in tests must always use bash.
2. Error message should be printed to stderr.
3. Right now I experiment with elogind-less system, trying out seatd and
greetd, and try to figure out when and how process (especially shepherd)
should be started and killed.  I'll share my findings on this later, but
it's very likely that we will get rid of on-first-login at all (or at
least won't source it automatically by login shell in all or some the
cases).

Do you want me to prepare patch for #2?

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR
  2022-08-01 12:49   ` Andrew Tropin
  2022-08-01 14:09     ` Andrew Tropin
@ 2022-08-01 22:12     ` Maxime Devos
  1 sibling, 0 replies; 8+ messages in thread
From: Maxime Devos @ 2022-08-01 22:12 UTC (permalink / raw)
  To: Andrew Tropin, Ludovic Courtès; +Cc: 56758


[-- Attachment #1.1.1.1: Type: text/plain, Size: 1157 bytes --]

On 01-08-2022 14:49, Andrew Tropin wrote:

>> However this one is incorrect as it would lead (ice-9 string-fun) from
>> the host Guile to be imported into the build environment, thereby making
>> the result dependent on the version of Guile that is used “outside” (you
>> may have seen a warning like “importing (ice-9 string-fun) from the
>> host”.)
> Why so?  I expected modules closure to be compiled on build side and
> provided to activation script via preset load-path.

This is true, and this causes the problem that Ludo' describes:

Two problems:

* (ice-9 string-fun) is part of Guile, so compiling it again is 
pointless (and potentially harmful, if ice-9/string-fun.scm contains a 
reference /gnu/store/.../some-target-specific-library.so)

* a form of non-determinism and non-reproducibility -- you are copying 
the modules from the Guile that 'guix' is run with, instead of always 
using the modules from the Guile that is defined inside Guix.

* additionally, maybe the inside-Guix and what-Guix-is-compiled-with 
Guile expect different behaviour of (ice-9 string-fun), causing bugs

Greetings,
Maxime.



[-- Attachment #1.1.1.2: Type: text/html, Size: 1706 bytes --]

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#56758] [PATCH v2 0/4] Don't try to mkdir XDG_RUNTIME_DIR
  2022-08-01 10:08 ` Ludovic Courtès
  2022-08-01 12:49   ` Andrew Tropin
@ 2022-08-02  6:00   ` Andrew Tropin
  2022-08-05  9:06     ` bug#56758: " Ludovic Courtès
  1 sibling, 1 reply; 8+ messages in thread
From: Andrew Tropin @ 2022-08-02  6:00 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 56758


[-- Attachment #1.1: Type: text/plain, Size: 614 bytes --]


Changes since v1:
- Don't use modules closure.
- Use string-append instead of format.
- Use warning instead of display.
- Hardcode SHELL=bash for home tests inside container.

Andrew Tropin (4):
  home: xdg: Use single @ intsead of @@.
  home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
  home: Use warning instead of display.
  tests: Make tests inside container reproducible.

 gnu/home/services.scm     |  8 +++++---
 gnu/home/services/xdg.scm | 25 ++++++++++++++++---------
 tests/guix-home.sh        |  5 ++++-
 3 files changed, 25 insertions(+), 13 deletions(-)

-- 
2.37.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: v2-0001-home-xdg-Use-single-intsead-of.patch --]
[-- Type: text/x-patch, Size: 1883 bytes --]

From e4b582654903d2cc227f8824df7873bf75f8b100 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Thu, 21 Jul 2022 15:24:32 +0300
Subject: [PATCH v2 1/4] home: xdg: Use single @ intsead of @@.

* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation,
home-xdg-user-directories-files-service): Use single @ intsead of @@.
---
 gnu/home/services/xdg.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 71c028c788..04cf9d0aed 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -23,6 +23,7 @@ (define-module (gnu home services xdg)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu home services utils)
   #:use-module (guix gexp)
+  #:use-module (guix modules)
   #:use-module (guix records)
   #:use-module (guix i18n)
   #:use-module (guix diagnostics)
@@ -106,7 +107,7 @@ (define (home-xdg-base-directories-environment-variables-service config)
 
 (define (ensure-xdg-base-dirs-on-activation config)
   #~(map (lambda (xdg-base-dir-variable)
-           ((@@ (guix build utils) mkdir-p)
+           ((@ (guix build utils) mkdir-p)
             (getenv
              xdg-base-dir-variable)))
          '#$(map (lambda (field)
@@ -207,8 +208,8 @@ (define (home-xdg-user-directories-activation-service config)
                    home-xdg-user-directories-configuration-fields)))
     #~(let ((ensure-dir
              (lambda (path)
-               (mkdir-p
-                ((@@ (ice-9 string-fun) string-replace-substring)
+               ((@ (guix build utils) mkdir-p)
+                ((@ (ice-9 string-fun) string-replace-substring)
                  path "$HOME" (getenv "HOME"))))))
         (display "Creating XDG user directories...")
         (map ensure-dir '#$dirs)
-- 
2.37.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: v2-0002-home-xdg-Skip-mkdir-XDG_RUNTIME_DIR-in-activation.patch --]
[-- Type: text/x-patch, Size: 1841 bytes --]

From 35125e96522c0539308f09a151ff67571a865900 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Tue, 2 Aug 2022 08:00:21 +0300
Subject: [PATCH v2 2/4] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation
 script.

* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
XDG_RUNTIME_DIR in activation script.
---
 gnu/home/services/xdg.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 04cf9d0aed..63c6041cd4 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -110,12 +110,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
            ((@ (guix build utils) mkdir-p)
             (getenv
              xdg-base-dir-variable)))
-         '#$(map (lambda (field)
-                   (format
-                    #f "XDG_~a"
-                    (object->snake-case-string
-                     (configuration-field-name field) 'upper)))
-                 home-xdg-base-directories-configuration-fields)))
+         '#$(filter-map
+             (lambda (field)
+               (let ((variable
+                      (string-append
+                       "XDG_"
+                       (object->snake-case-string
+                        (configuration-field-name field) 'upper))))
+                 ;; XDG_RUNTIME_DIR shouldn't be created during activation
+                 ;; and will be provided by elogind or other service.
+                 (and (not (string=? "XDG_RUNTIME_DIR" variable))
+                      variable)))
+             home-xdg-base-directories-configuration-fields)))
 
 (define (last-extension-or-cfg config extensions)
   "Picks configuration value from last provided extension.  If there
-- 
2.37.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: v2-0003-home-Use-warning-instead-of-display.patch --]
[-- Type: text/x-patch, Size: 1776 bytes --]

From b67b8217830ee6e1afdf7532a961835fd77a5519 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Tue, 2 Aug 2022 08:20:38 +0300
Subject: [PATCH v2 3/4] home: Use warning instead of display.

* gnu/home/services/xdg.scm (compute-on-first-login-script): Use warning
instead of display.
---
 gnu/home/services.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/home/services.scm b/gnu/home/services.scm
index 6fbc91fab2..4376422014 100644
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@@ -368,9 +368,11 @@ (define %initialize-gettext
 (define (compute-on-first-login-script _ gexps)
   (program-file
    "on-first-login"
-   (with-imported-modules (source-module-closure '((guix i18n)))
+   (with-imported-modules (source-module-closure '((guix i18n)
+                                                   (guix diagnostics)))
      #~(begin
-       (use-modules (guix i18n))
+         (use-modules (guix i18n)
+                      (guix diagnostics))
        #$%initialize-gettext
 
        (let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR")
@@ -387,7 +389,7 @@ (define (compute-on-first-login-script _ gexps)
                (begin #$@gexps (touch flag-file-path)))
              ;; TRANSLATORS: 'on-first-login' is the name of a service and
              ;; shouldn't be translated
-             (display (G_ "XDG_RUNTIME_DIR doesn't exists, on-first-login script
+             (warning (G_ "XDG_RUNTIME_DIR doesn't exists, on-first-login script
 won't execute anything.  You can check if xdg runtime directory exists,
 XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
 script by running '$HOME/.guix-home/on-first-login'"))))))))
-- 
2.37.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: v2-0004-tests-Make-tests-inside-container-reproducible.patch --]
[-- Type: text/x-patch, Size: 1005 bytes --]

From 4c7084308338aa3eaedb3097b43117c421c39580 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Tue, 2 Aug 2022 08:40:31 +0300
Subject: [PATCH v2 4/4] tests: Make tests inside container reproducible.

* tests/guix-home.sh: Make tests inside container reproducible.
---
 tests/guix-home.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/guix-home.sh b/tests/guix-home.sh
index 1d1acbfd6e..d5e2dadbb5 100644
--- a/tests/guix-home.sh
+++ b/tests/guix-home.sh
@@ -107,7 +107,10 @@ EOF
 
     if container_supported
     then
-	# Run the home in a container.
+	# Run the home in a container.  Always use bash inside container for
+        # reproducibility of the tests.
+        # TODO: Make container independent from external environment variables.
+        SHELL=bash
 	guix home container home.scm -- true
 	! guix home container home.scm -- false
 	test "$(guix home container home.scm -- echo '$HOME')" = "$HOME"
-- 
2.37.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* bug#56758: [PATCH v2 0/4] Don't try to mkdir XDG_RUNTIME_DIR
  2022-08-02  6:00   ` [bug#56758] [PATCH v2 0/4] " Andrew Tropin
@ 2022-08-05  9:06     ` Ludovic Courtès
  2022-08-05 15:03       ` [bug#56758] " Andrew Tropin
  0 siblings, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2022-08-05  9:06 UTC (permalink / raw)
  To: Andrew Tropin; +Cc: 56758-done

Hi Andrew,

Andrew Tropin <andrew@trop.in> skribis:

>   home: xdg: Use single @ intsead of @@.
>   home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
>   home: Use warning instead of display.
>   tests: Make tests inside container reproducible.

Applied, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#56758] [PATCH v2 0/4] Don't try to mkdir XDG_RUNTIME_DIR
  2022-08-05  9:06     ` bug#56758: " Ludovic Courtès
@ 2022-08-05 15:03       ` Andrew Tropin
  0 siblings, 0 replies; 8+ messages in thread
From: Andrew Tropin @ 2022-08-05 15:03 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 56758-done

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

On 2022-08-05 11:06, Ludovic Courtès wrote:

> Hi Andrew,
>
> Andrew Tropin <andrew@trop.in> skribis:
>
>>   home: xdg: Use single @ intsead of @@.
>>   home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
>>   home: Use warning instead of display.
>>   tests: Make tests inside container reproducible.
>
> Applied, thanks!
>
> Ludo’.

Thank you very much!)

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-08-05 15:06 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-25  9:43 [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR Andrew Tropin
2022-08-01 10:08 ` Ludovic Courtès
2022-08-01 12:49   ` Andrew Tropin
2022-08-01 14:09     ` Andrew Tropin
2022-08-01 22:12     ` Maxime Devos
2022-08-02  6:00   ` [bug#56758] [PATCH v2 0/4] " Andrew Tropin
2022-08-05  9:06     ` bug#56758: " Ludovic Courtès
2022-08-05 15:03       ` [bug#56758] " Andrew Tropin

Code repositories for project(s) associated with this inbox:

	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.