GNU bug report logs - #78428
[PATCH] gnu: elogind: Adjust patch for pkttyagent path.

Previous Next

To reply to this bug, email your comments to 78428 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: guix-patches <at> gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH] gnu: elogind: Adjust patch for pkttyagent path.
Date: Wed, 14 May 2025 19:50:28 +0200

* gnu/packages/freedesktop.scm (elogind):
[#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
version 255.17.

Change-Id: I259c93d806482d10bd438a8ba47dcf5a270feeca
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index de8fb975bc..281c8b33ec 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -949,8 +949,8 @@ (define-public elogind
          (add-after 'unpack 'fix-pkttyagent-path
            (lambda _
              (substitute* "meson.build"
-               (("join_paths\\(bindir, 'pkttyagent'\\)")
-                "'\"/run/current-system/profile/bin/pkttyagent\"'"))))
+               (("bindir / 'pkttyagent'")
+                "'/run/current-system/profile/bin/pkttyagent'"))))
          (add-after 'unpack 'use-global-hook-directory
            ;; XXX There is no run-time setting to set this per-process, only a
            ;; build-time, hard-coded list of global directories.

base-commit: c5265b90b055ee15908298c5d463301f1aae2eb1
-- 
2.49.0

Message #8 received at 78428 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78428 <at> debbugs.gnu.org
Subject: Re: [bug#78428] [PATCH] gnu: elogind: Adjust patch for pkttyagent
 path.
Date: Sat, 17 May 2025 00:23:36 +0900

Hi,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> * gnu/packages/freedesktop.scm (elogind):
> [#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
> version 255.17.
>
> Change-Id: I259c93d806482d10bd438a8ba47dcf5a270feeca
> ---
>  gnu/packages/freedesktop.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index de8fb975bc..281c8b33ec 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -949,8 +949,8 @@ (define-public elogind
>           (add-after 'unpack 'fix-pkttyagent-path
>             (lambda _
>               (substitute* "meson.build"
> -               (("join_paths\\(bindir, 'pkttyagent'\\)")
> -                "'\"/run/current-system/profile/bin/pkttyagent\"'"))))
> +               (("bindir / 'pkttyagent'")
> +                "'/run/current-system/profile/bin/pkttyagent'"))))

Oof.  It's terrible that these substitution fail silently.  This
packages rebuilds about 4K, so we'll need to make a 'elogind-fixed'
package and use it as a replacement (graft).  Would you like to do so in
this same change?  You can send a v2.

-- 
Thanks,
Maxim

Message #11 received at 78428 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 78428 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH v1] gnu: elogind: Adjust patch for pkttyagent
Date: Fri, 16 May 2025 19:28:30 +0200

* gnu/packages/freedesktop.scm (elogind/fixed): New variable.
[#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
version 255.17.

* gnu/packages/freedesktop.scm (elogind): Replace with elogind/fixed.

Change-Id: I9c474291816aee7464db5cbe9398b589479e79cf
---
 gnu/packages/freedesktop.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index de8fb975bc..bcddb6fd0c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -879,6 +879,7 @@ (define-public elogind
   (package
     (name "elogind")
     (version "255.17")
+    (replacement elogind/fixed)
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1065,6 +1066,21 @@ (define-public elogind
 of a the system to know what users are logged in, and where.")
     (license license:lgpl2.1+)))
 
+(define-public elogind/fixed
+  (hidden-package
+   (package
+     (inherit elogind)
+     (replacement elogind/fixed)
+     (arguments
+      (substitute-keyword-arguments (package-arguments elogind)
+        ((#:phases phases)
+         `(modify-phases ,phases
+           (replace 'fix-pkttyagent-path
+             (lambda _
+               (substitute* "meson.build"
+                 (("bindir / 'pkttyagent'")
+                  "'/run/current-system/profile/bin/pkttyagent'")))))))))))
+
 (define-public basu
   (package
     (name "basu")

base-commit: d6d03854b57b665ea42bc3e0a04b3e9be66798d8
-- 
2.49.0

Message #14 received at 78428 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 78428 <at> debbugs.gnu.org
Subject: Re: [bug#78428] [PATCH] gnu: elogind: Adjust patch for pkttyagent
 path.
Date: Fri, 16 May 2025 19:36:27 +0200

Hi,

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hi,
>
> Sergey Trofimov <sarg <at> sarg.org.ru> writes:
>
>> * gnu/packages/freedesktop.scm (elogind):
>> [#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
>> version 255.17.
>>
[...]
>
> Oof.  It's terrible that these substitution fail silently.

I remember phases had to return #t, it got relaxed in https://codeberg.org/guix/guix-mirror/commit/9621809ce8d984fff6421cb55fc851a24954be06

> 
> This packages rebuilds about 4K, so we'll need to make a
> 'elogind-fixed' package and use it as a replacement (graft). Would you
> like to do so in this same change? You can send a v2.

Sure, done.

Message #17 received at 78428 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78428 <at> debbugs.gnu.org
Subject: Re: [bug#78428] [PATCH] gnu: elogind: Adjust patch for pkttyagent
 path.
Date: Tue, 20 May 2025 16:58:02 +0900

Hi,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> Hi,
>
> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
>> Hi,
>>
>> Sergey Trofimov <sarg <at> sarg.org.ru> writes:
>>
>>> * gnu/packages/freedesktop.scm (elogind):
>>> [#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
>>> version 255.17.
>>>
> [...]
>>
>> Oof.  It's terrible that these substitution fail silently.
>
> I remember phases had to return #t, it got relaxed in
> https://codeberg.org/guix/guix-mirror/commit/9621809ce8d984fff6421cb55fc851a24954be06

Yeah, the return value wouldn't here though.  What I meant was that it
would be nice if substitute* could fail when a pattern failed to match
(and thus substitute) anything.  See for example bug#36772.

>> 
>> This packages rebuilds about 4K, so we'll need to make a
>> 'elogind-fixed' package and use it as a replacement (graft). Would you
>> like to do so in this same change? You can send a v2.
>
> Sure, done.

Thanks.  I'll take a look now.

-- 
Thanks,
Maxim

Message #22 received at 78428-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 78428-done <at> debbugs.gnu.org
Subject: Re: bug#78428: [PATCH] gnu: elogind: Adjust patch for pkttyagent path.
Date: Wed, 21 May 2025 08:14:43 +0900

Hi,

Sergey Trofimov <sarg <at> sarg.org.ru> writes:

> * gnu/packages/freedesktop.scm (elogind/fixed): New variable.
> [#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
> version 255.17.
>
> * gnu/packages/freedesktop.scm (elogind): Replace with elogind/fixed.
>
> Change-Id: I9c474291816aee7464db5cbe9398b589479e79cf
> ---
>  gnu/packages/freedesktop.scm | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index de8fb975bc..bcddb6fd0c 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -879,6 +879,7 @@ (define-public elogind
>    (package
>      (name "elogind")
>      (version "255.17")
> +    (replacement elogind/fixed)
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> @@ -1065,6 +1066,21 @@ (define-public elogind
>  of a the system to know what users are logged in, and where.")
>      (license license:lgpl2.1+)))
>  
> +(define-public elogind/fixed
> +  (hidden-package
> +   (package
> +     (inherit elogind)
> +     (replacement elogind/fixed)
> +     (arguments
> +      (substitute-keyword-arguments (package-arguments elogind)
> +        ((#:phases phases)
> +         `(modify-phases ,phases
> +           (replace 'fix-pkttyagent-path
> +             (lambda _
> +               (substitute* "meson.build"
> +                 (("bindir / 'pkttyagent'")
> +                  "'/run/current-system/profile/bin/pkttyagent'")))))))))))
> +

Modified like this:

--8<---------------cut here---------------start------------->8---
modified   gnu/packages/freedesktop.scm
@@ -1070,16 +1070,15 @@ (define-public elogind/fixed
   (hidden-package
    (package
      (inherit elogind)
-     (replacement elogind/fixed)
      (arguments
       (substitute-keyword-arguments (package-arguments elogind)
         ((#:phases phases)
-         `(modify-phases ,phases
-           (replace 'fix-pkttyagent-path
-             (lambda _
-               (substitute* "meson.build"
-                 (("bindir / 'pkttyagent'")
-                  "'/run/current-system/profile/bin/pkttyagent'")))))))))))
+         #~(modify-phases #$phases
+             (replace 'fix-pkttyagent-path
+               (lambda _
+                 (substitute* "meson.build"
+                   (("bindir / 'pkttyagent'")
+                    "'/run/current-system/profile/bin/pkttyagent'")))))))))))
 
 (define-public basu
   (package
--8<---------------cut here---------------end--------------->8---

(the most important part is that 'replacement' field should be on the
package *being* replaced only, not onthe replacement package itself).

And pushed!

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.