From debbugs-submit-bounces@debbugs.gnu.org Wed May 14 13:50:45 2025 Received: (at submit) by debbugs.gnu.org; 14 May 2025 17:50:45 +0000 Received: from localhost ([127.0.0.1]:44992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFGFh-0001jc-3C for submit@debbugs.gnu.org; Wed, 14 May 2025 13:50:45 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39834) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uFGFf-0001jM-PE for submit@debbugs.gnu.org; Wed, 14 May 2025 13:50:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFGFZ-0008In-PS for guix-patches@gnu.org; Wed, 14 May 2025 13:50:37 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFGFX-00056e-QG for guix-patches@gnu.org; Wed, 14 May 2025 13:50:37 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3a1f9791a4dso45322f8f.0 for ; Wed, 14 May 2025 10:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747245031; x=1747849831; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3WFPLQuRxysfr0PdU2iWVtEGAZptVpQVJy391HI38Pk=; b=RoUXqFswEgIpIEFDVF7hEpgU4/WByXnyy4bq/ra/DsAC8YC0s22eDu2HP/jOnSmXfH VUVJKoQE4aP7GrxhsLlyRbgyA5R2ypj1py08ipNwJ9hU+2DWBi0aAD6ATuLHN7klK9j/ r2V4KtaFv7IdB2Q6EoiMGZiCuNHW4XhRAAxj/UzoJvHAutsD2dN/26P9xSakhDmkLScS Bvow/Lo1rFLj1JY6/pq3QiwnpzHWqHdm2dSfpWwefybZzcH0K3k9fG1O1Cr5JbGBeXcY r4B3vyx/ul0fgBizMEnRNiY3doq88qKlnx+wFmPxhVf4OKPxcM9quthQlXAdoswb46yk yh7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747245031; x=1747849831; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3WFPLQuRxysfr0PdU2iWVtEGAZptVpQVJy391HI38Pk=; b=RemHJej3lq18D4qWoPG42/aS86L6W3HuHV+ahWVm/h355qKMf4PrwNimK3Wy7GE6UI GLzoFYIZSP6jmt28eL5A/sJe1GShYCbhf5j0TcHA4rt7J0gBIIUoc2lZQOAZM1gRVKRW GV0CJjwG3/jb1i8MvroHgk/XlmzQcnEZ30sDPysWxs6o7QalgJc6RyDiBMlNXHKB/d64 m8Y3MFc0/hct9rpR1xfb15etrF4nHuZ/G1TOs625u0WUdy4jgMMnIvc367isvfQxVXbr oYj8fXa0gpIqfGUZfY07f2feO+Eqc3kbs0rIobgnV6ixbXJnouI/gsuXOUm0mHl4vJjZ RcyQ== X-Gm-Message-State: AOJu0YycTJBfmNIiWpxN3QTl0V/UXT2MAtyZVj9KJU8arT290o5R4JvL tScfZMxwKuEis8PYEB5MIV8C2amZrbtDzVcRwy9ulw5RxcFc2iKM4Zf2bdw6aE7zaN8lFLglbks 2vcQ= X-Gm-Gg: ASbGncv0Z/DAYGTerFcHEU25+ewOIFzg7pDOO0dCU92KHnJ7JlUIBzCbIBg7zWs5W7q D1Qjs/8B2LR+h7j1JLBsEfhhLLHTQd0qDg7BEvVlGrz9y5fH+F4cv3b9t+MrbZoicEMM2YuPXS1 c2lIuh8SUiK+zINgjfxLH1zz1F5rxXXtOe7D82aCV/6VmUc5CnAwJ3rd7NE0t8dQNxBjjrtc/EC 981d4IM/myB7wV+6HkfSFir0UMk8wQ7pnAP7BFI/w6wAt39BTWKdvLmnIjLdafEhrB5AVtcsn8O VJENqrc6CsXjgzB4EuXuHTYHKmEAUMDne13GuWcSqc3DzlQZiQ== X-Google-Smtp-Source: AGHT+IEKtJ6vULoYp0Mh8WPVB+26+QyJNjpqaRRHL9KIc+nbjs4+SM8cYMVvSEsd2RNir5cb0oWS7w== X-Received: by 2002:a05:6000:2207:b0:3a0:b84d:8b4e with SMTP id ffacd0b85a97d-3a34991e896mr3811828f8f.45.1747245031436; Wed, 14 May 2025 10:50:31 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f28f7sm20119965f8f.41.2025.05.14.10.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 10:50:30 -0700 (PDT) From: Sergey Trofimov To: guix-patches@gnu.org Subject: [PATCH] gnu: elogind: Adjust patch for pkttyagent path. Date: Wed, 14 May 2025 19:50:28 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=sarg@sarg.org.ru; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Sergey Trofimov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/freedesktop.scm (elogind): [#:phases]: 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 From debbugs-submit-bounces@debbugs.gnu.org Fri May 16 11:23:49 2025 Received: (at 78428) by debbugs.gnu.org; 16 May 2025 15:23:49 +0000 Received: from localhost ([127.0.0.1]:40029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFwua-0002zY-Tn for submit@debbugs.gnu.org; Fri, 16 May 2025 11:23:49 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:59448) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFwuX-0002yu-VA for 78428@debbugs.gnu.org; Fri, 16 May 2025 11:23:47 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-73c17c770a7so2412864b3a.2 for <78428@debbugs.gnu.org>; Fri, 16 May 2025 08:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747409019; x=1748013819; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=rKKcBiaPNmpB604jo0jmt/USeQsnICAaAau0m21ClDs=; b=c0uNzgrkjL0seTn/qKPHDMhhJedCcErWsp1vopO4ihalC63DF0VIaePPnJpI2PpD5d 9woouLvf6qfthfXA9a70oATUoWenMFBNIMAB/QVNaFjIXNwhBGO7PDHW/uCKkhsr33L8 7MW2N/4wFKTWN2kwR817RvGkOd7nmSEnK6Cf1X/YC1ztDA9mYAw1EZgAmghrAEYfwZDU Iv2tW6UopLD9I+UWlryzdn8UFjC75wL4u4JuWHohQHY/fioarPX01DlLMD7haJwIFDEu oCQzEM1G7hQjix9zEhLyCV4gQnr3US4Odxz07DYBhJs8XzkI0UOKdOlEUVudvO6FoT/y N3GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747409019; x=1748013819; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rKKcBiaPNmpB604jo0jmt/USeQsnICAaAau0m21ClDs=; b=G+2IiyxgYg6j4GQB2knaQ5FJHIiQTH6q0Y29nuoNc6CEom7hT32tAyOhkp6sQPkM4X KhWrpWrD1adwjgk2o8hyiUKjS46QH9FG/z4mC8fh5Xty//1I4yeW/VHWI+NcDo9hQ9P+ TKak2MXKy3CwosIErYAj9r2FIPqNkKUnXShLXCLSYvN8ZllWQrb0/E/TI5Yyek1oiexu kYgTiwC1JFiYWIHoPYZLzFYqNjSVbIHkSkzuM+wr/lO+uATC3fcw1MAmZhmxCGnsTj3a JOeMjN0+zSycm/fRgNfVH3+oZL3iXepmPl64W6N6EC2Zkh0UcNN0s3WxcdmaxRQQwz0M LdbA== X-Gm-Message-State: AOJu0YwbL8nICGkAxS6uHB63HXu2QRQcYMwzfsoYon7JVaPfBPq58xyT B26MiWooSojMgz4PrMTto1f0tbG36bf9xojFcKNW7OM48uSXuMVxGCGAw9GtePVJ X-Gm-Gg: ASbGncvrO9Yj/d5ovmfr0amRfo1Qf7D9o+OgGgdmLZlaRIwvG5jVbMaXcq/vV5LPVl3 h8lroL33cPegEyEm3XlYrRpqn5ykfcK7Ilrnk039UO+BuO7bXpcHA554I3AAhl/uTi8AsYneoEr E0i/ABdNbNKmjaxPd5wNcHDGn4zJ3IyZJao/5/FM4lM9Xtsap/X5pl3STq4V3Av1+WicNf0PSex SsfXjwPIRawhue8OPExPzW6BuQJo5ZO4y1T9LBGuui/FLuYcREZRTDQrZdhwDxFtCRfYjTK5V+K 59yy01JxSA/xbaCDv1QzIv8vFo9LKpiWA3o4h+7kSO6wmiJYUA== X-Google-Smtp-Source: AGHT+IEhC+e+dfOWH/cG2sRaKdl9CADZrqQWu5yhIT+ka6ArZ/OeCaxjsQjuTQNGK1gE3DMbzk/MiA== X-Received: by 2002:a05:6a00:114e:b0:740:6fa3:e429 with SMTP id d2e1a72fcca58-742a9802ff9mr4479902b3a.11.1747409019343; Fri, 16 May 2025 08:23:39 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a96deaf4sm1653675b3a.23.2025.05.16.08.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 May 2025 08:23:38 -0700 (PDT) From: Maxim Cournoyer To: Sergey Trofimov Subject: Re: [bug#78428] [PATCH] gnu: elogind: Adjust patch for pkttyagent path. In-Reply-To: (Sergey Trofimov's message of "Wed, 14 May 2025 19:50:28 +0200") References: Date: Sat, 17 May 2025 00:23:36 +0900 Message-ID: <87ecwofukn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78428 Cc: 78428@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Sergey Trofimov writes: > * gnu/packages/freedesktop.scm (elogind): > [#:phases]: 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 From debbugs-submit-bounces@debbugs.gnu.org Fri May 16 13:28:46 2025 Received: (at 78428) by debbugs.gnu.org; 16 May 2025 17:28:46 +0000 Received: from localhost ([127.0.0.1]:40679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFyrV-0006x0-Vt for submit@debbugs.gnu.org; Fri, 16 May 2025 13:28:46 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:55428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFyrS-0006vn-Gf for 78428@debbugs.gnu.org; Fri, 16 May 2025 13:28:43 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5fbeadf2275so4442712a12.2 for <78428@debbugs.gnu.org>; Fri, 16 May 2025 10:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747416516; x=1748021316; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=l/w9F4l0ic+C8h6TMmZ96Eg4eV2WoMbHb2jSr1GiC9Y=; b=yLQuMolT9G3ohqZmvgiHuytgoenjgX6lSwgdYNI6Bpiqc45hTBStE1t6KJYzwfOB9k CKLaU/n08rkrf+iHGUpK59J9L628ZJq0H6Wtb6GBevkq2GKxWmpoXJzj1CKpR1AgIrzg UTQjz+KxhMveFJq74qOEXUNwiRr7zxgEowSkRI6yy+fgck6yf1TtCZcO6WleJE2/oc1o wl62eO8lV9jVgUSaWFgMfiGvC1V0VechpCBob9VKzIxR8dcodrGFRYHrLPHRaDn1mqtt 6jZQH5s1Kz1xP/PcuSEa7E0yDTg8Ht+DccL179drLpN25Y4BlLvuJh/2J5swfGdZvi1S GEeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747416516; x=1748021316; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l/w9F4l0ic+C8h6TMmZ96Eg4eV2WoMbHb2jSr1GiC9Y=; b=AZzpJq1gTAw0pc/2TPg32gssWa21mo/G3Y5rgUMcYkz7Gnp38K7li/kelQU5mDdes+ lSZ+NHwbAQ9JQ6ULbL3hkbg4LXAKY1XzAEK8xa3BVRmi4Bh0QNRUrj1UgV9T3VqpgyC7 eo6OTfDf1OUmqJz/18asv6Oo17WN8cbOWhc0krNdhwdcPdVNzaFkJ4N3b3MSiXFKcrt5 pMvJ9sb4wvFNW8PCxNXc1O7j5UqafqvtukmlED5TrIQ4L4B8wErtjAGqK9kW3qD7gds3 VneJNYEq/eGnUHIVmRC4+P+Dicw6vEPgNgEAMDdF09xL31n5PAVpqmccew9UpdJzlKa6 Ljkw== X-Gm-Message-State: AOJu0YykWLG/3LefCiKta2fOIQI2rgsEJJe//1MwSeglc853Pyb96V2Z J3VjkpR/GG3OdZ5700AlvE4n7QPIhLluGm1F5q6nbLfPSLfIn8uUiGWwZzATPPKvlJHWwLsazUZ Li6yPNec= X-Gm-Gg: ASbGnctkaelp4dC/ZkOVpROuFr2q4TWwoJWkdOkCtoyH2K2gE3gi7950p+fiFZnmerd 6yCS2yoKtx935SFhk5+ZJSXZ/HupLxESgSUY/8nnnaQIXyYjjYhg+I8b2DqAOhw+bAoTNVOWVHq YrbNHFQcBv6bMu3r6FIAd+4epZhiSFuLNQ4mmXB2kXmCKkVzSpJWBopBY4PDzpmcDAAioeikfZY K5mTNpOkVL8G+oJ7lFy/zWqgOqFA31BCwTPcs6JH3UqBir3AtuhTZA6RsPXcexB4lBSEoCi3Qkd B0rnrpGjGfoCXN2nluOu0f3YMIjnpS4JUP4VEOr1fsxAzbdq X-Google-Smtp-Source: AGHT+IFUb4U6NZwrb2ITFqGN3zwxBmv0VzdfUVWk7+0/Jr9J8m3+yDuWQLRQCB9GOfxWNkyHLXt0SQ== X-Received: by 2002:a17:907:1b13:b0:ad5:e14:4c74 with SMTP id a640c23a62f3a-ad536b81991mr284759466b.23.1747416515837; Fri, 16 May 2025 10:28:35 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d498d05sm189042466b.149.2025.05.16.10.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 May 2025 10:28:35 -0700 (PDT) From: Sergey Trofimov To: 78428@debbugs.gnu.org Subject: [PATCH v1] gnu: elogind: Adjust patch for pkttyagent Date: Fri, 16 May 2025 19:28:30 +0200 Message-ID: <4e1577448b55f358096ae0b2d1b129d9633f9b03.1747416477.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Debbugs-Cc: Sergey Trofimov , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78428 Cc: Sergey Trofimov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/freedesktop.scm (elogind/fixed): New variable. [#:phases]: 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 From debbugs-submit-bounces@debbugs.gnu.org Fri May 16 13:36:38 2025 Received: (at 78428) by debbugs.gnu.org; 16 May 2025 17:36:38 +0000 Received: from localhost ([127.0.0.1]:40692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFyz7-0008Cw-RJ for submit@debbugs.gnu.org; Fri, 16 May 2025 13:36:38 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:46159) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFyz4-0008Bn-ST for 78428@debbugs.gnu.org; Fri, 16 May 2025 13:36:35 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-441d1ed82dbso22827225e9.0 for <78428@debbugs.gnu.org>; Fri, 16 May 2025 10:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747416989; x=1748021789; darn=debbugs.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4i5uLYmHSMGPjSPnTuKdAXJCORf1/LNEKSJwYhAFXZg=; b=XqEVTPSXOmRH1bx9l+KHZ9jM5hFBMT9uAfiaAmGDH+xFmHSgY030q0dbCSKW2ntZTq mFryaicCjDxazio+fGmwydohMkvSmPeXAOsez9fGM1DolrJzOiHcdOVsyzshWZCUMw4t +N973DwxoJ1lB46oES0wuc/CqGv/2ZfH4q6FV8/7f7BsmKf0f/Ds5YMH3EFyzVfpvdAW vaNLtSuaHD8P08ICEMUVYimi6/KghQUNTDp/a0JZo8qd8XSisSrtROk7/sgaHBnDbojf YxZNbTs1CYwAldzl+gFOFzajR+tLxjHsBuoop1bNee9vCHFDRjigjgI577Gjpf+xIvtQ fdKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747416989; x=1748021789; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4i5uLYmHSMGPjSPnTuKdAXJCORf1/LNEKSJwYhAFXZg=; b=Rd8hjxWgfiIauHJmQ+W6v7yZMN6A1+Ugt4oD18WHeR5Ryx/NJ1AKsOx5uCzvdorfna lvyVzc+oCc1ZoXPqLy0bAasShXhSEFxJ/8gPsLUae1GYJj1HLKOfarogd8ZZANQdGhks hcBU81CeuxvPOA9IVEhI4f9xjfNbBSxpc2BQLrt2nMJej+JzAbytRtLndVrccHOWdInr /g3ADL6FbZ3kvMQhC6/jF24Q3YVT/hgSXFvku34i3+91QTBX7WfwJOBECDKVJKLMiYU2 fmVFjkF9JGI8BLnR4nfyhiCMa8f7fq7WqbpgP0BnVMqclXiEgpxCUpafNxJOb0UF1vOG z2jQ== X-Gm-Message-State: AOJu0YzbHmr5afzTDo/Woo3tIXUASGxHzoTt35Wr3SClqkGTLiV2GN8e RHGp4dhcmHK4lthS14l5BcIqSp/OvuQGLlNZfd8QeY+BHjBLggTQkLD7jzrA+uw2jds= X-Gm-Gg: ASbGncuTcJM28tLr3m5uyR/9uEvvMhpJNpxEGDFm9f2lQj5jEySsthxRsQzAvDUnzbq SdArtfZSba8lMQsuL6IQzcYbquWt4i4h1o/JZbiwGahP2slYbXTL5BJnCOG91Jqfkreh2vprzJl 9p0idBwGNl0G8SWW9xCr8SsaBV13xdPTjzAinWetxovh+T4BE+f3L4Sgqnj5ZSSK3PQI1w+Bz9b arQM9tdF0wwDvsHvA34rp+1/u8Xc92U/1DQktsLqJ6u7QjQqIYKnM+IxZDePRxP20nl7ZypCbg8 x3FiTblQPO9Z1jZuvprAOnP6qChecHFoSfN8d5WfHdkksy/o X-Google-Smtp-Source: AGHT+IHpdIzI+lLG8LEMCGp+vgLF6XopEKXPRm8yUWwqbork6tlIozQLuI7rHncXGQdotE652PRPGw== X-Received: by 2002:a05:600c:6748:b0:442:e011:7eb with SMTP id 5b1f17b1804b1-442fd671befmr55367735e9.30.1747416988535; Fri, 16 May 2025 10:36:28 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442fd583f07sm39903245e9.31.2025.05.16.10.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 May 2025 10:36:27 -0700 (PDT) From: Sergey Trofimov To: Maxim Cournoyer Subject: Re: [bug#78428] [PATCH] gnu: elogind: Adjust patch for pkttyagent path. In-Reply-To: <87ecwofukn.fsf@gmail.com> (Maxim Cournoyer's message of "Sat, 17 May 2025 00:23:36 +0900") References: <87ecwofukn.fsf@gmail.com> User-Agent: mu4e 1.12.9; emacs 30.0.92 Date: Fri, 16 May 2025 19:36:27 +0200 Message-ID: <871pso31b8.fsf@sarg.org.ru> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78428 Cc: 78428@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > Hi, > > Sergey Trofimov writes: > >> * gnu/packages/freedesktop.scm (elogind): >> [#:phases]: 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. From debbugs-submit-bounces@debbugs.gnu.org Tue May 20 03:58:17 2025 Received: (at 78428) by debbugs.gnu.org; 20 May 2025 07:58:17 +0000 Received: from localhost ([127.0.0.1]:53524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHHrd-0003LR-BT for submit@debbugs.gnu.org; Tue, 20 May 2025 03:58:17 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:53552) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uHHrZ-0003KU-9J for 78428@debbugs.gnu.org; Tue, 20 May 2025 03:58:14 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-742c9563fd9so1959193b3a.3 for <78428@debbugs.gnu.org>; Tue, 20 May 2025 00:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747727886; x=1748332686; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=A7lFhb4U5Pe3Q9mmRZTJoZbjaz0xTb+kruC4WDiDjh0=; b=mw5jkeM2krLP5Rm8g5Ng58xWeW7f2y7C41+p8wqs0Bhqsb3i/LqjlgyKxATURamyv6 vZ6njEklTtudioU9I7qZp1QHJTq62XZVQmJS7mN0iKIczYaYcS5qz16zCKQAM6HhCpHz XlGI58FsbGdYPk7RE09nkjmS6ueBcyvmayW9Rn/drqWrw+6SmbsjMCc6z+2UAyse+4+W yDAbt9iPm3mBm8ikrov6Y0M40uhsdpmQhOzQAlViVtlrrorny/tiYOKfPnHO7/JnikJi ZiYPVDFS2r3UN5Bum66E6quoYLosg7UVLze1YcR/JNg9GiC6XcjqTVvm/yZBeWPA7uID aLPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747727886; x=1748332686; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=A7lFhb4U5Pe3Q9mmRZTJoZbjaz0xTb+kruC4WDiDjh0=; b=qU5OHWADyZ2km/0ePsKzAjibN+B4G1npF2/xVW5F+3x/ZXnjbOH+g4BfgtGW8SDx5n V4Qewbh+V8ASijd4lM4cnQ4ctBiD9QoBMQ6x1sp9kEgs2YN5I6tuu1+rIxguOgIcK3hg BFKilv7BorkKVIM0lWK1+yWAXt65fud+gJivfmVrhfIq3JTyao1wPNqVj26c27J98xb0 MBYx0jjicGbWfdrKmEVbX42AQloHu1fIHuQMDQM1cHLPAxGU9U8GUlT13rxGX2mseAPD VnjLbmOxhJ2sD81xxFDRWqcxbxVD/7jiKtR+Zavim6lCqScvgOw8Ii6kI/jX3lauwpm8 RIHA== X-Gm-Message-State: AOJu0Yz6Rj0uAlEMwfJtMRAMh89TwTAjsdAzsBLpiVkdXfnKpq9cMtT6 1BK4geSvA/iQgtQuZHLAzg6aJ2XbAkJq7wCduKd3HRrD1i0fMTkvZ9BCZ9+5aw== X-Gm-Gg: ASbGncvFbHI1JsbufabVE/q3uPyPZ7Uw7po2IG7LCcRCx4Bp+q0Fiklok2JW05ythjX j1veHJAG/NZQOIf8PZ2b16x6W5NCV3Ikg9q3+r1sC91O36L+nxgynuw7XQB8YNaviIc3oWTRy/O eCzV15rcrM9Z7FjDykkGLK8Bt0TdlT0TUUTnK+Ch/M91CMieDUOnnj6TRslWAVC9cM8la8DfUB9 gpE4r3Qcvj752L1+0W/9+TzL/QB8oI2jPtIz242a9NYnvb7WvnVewECiOVBYxqZadC+mB51FNdM heXhqLRtmfgYa9y2DujDLLhKoc0EH3uGi80Ppg6n7x7xc40qIw== X-Google-Smtp-Source: AGHT+IEWReOzvWMj/CSLA8RyV4eCgUQJscygkyvdz8gZ2WTyPJ8/B94PstHDTQa8upStMjgui6qlGA== X-Received: by 2002:a05:6a21:3a89:b0:215:d9fc:382e with SMTP id adf61e73a8af0-2170cc5f59bmr22057412637.13.1747727886067; Tue, 20 May 2025 00:58:06 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970d64fsm7611724b3a.64.2025.05.20.00.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 00:58:05 -0700 (PDT) From: Maxim Cournoyer To: Sergey Trofimov Subject: Re: [bug#78428] [PATCH] gnu: elogind: Adjust patch for pkttyagent path. In-Reply-To: <871pso31b8.fsf@sarg.org.ru> (Sergey Trofimov's message of "Fri, 16 May 2025 19:36:27 +0200") References: <87ecwofukn.fsf@gmail.com> <871pso31b8.fsf@sarg.org.ru> Date: Tue, 20 May 2025 16:58:02 +0900 Message-ID: <87bjrnbto5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78428 Cc: 78428@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Sergey Trofimov writes: > Hi, > > Maxim Cournoyer writes: > >> Hi, >> >> Sergey Trofimov writes: >> >>> * gnu/packages/freedesktop.scm (elogind): >>> [#:phases]: 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 From debbugs-submit-bounces@debbugs.gnu.org Tue May 20 19:14:57 2025 Received: (at 78428-done) by debbugs.gnu.org; 20 May 2025 23:14:57 +0000 Received: from localhost ([127.0.0.1]:38748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHWAi-00043I-O4 for submit@debbugs.gnu.org; Tue, 20 May 2025 19:14:57 -0400 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]:61673) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uHWAg-00042p-4d for 78428-done@debbugs.gnu.org; Tue, 20 May 2025 19:14:55 -0400 Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-4769aef457bso73986841cf.2 for <78428-done@debbugs.gnu.org>; Tue, 20 May 2025 16:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747782887; x=1748387687; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=yvD/fN8Sp9JWD+l5+6d8ZeUgil5q7lzYae0IXW3AWnc=; b=KnX2GqnJBJHAK9JcXUcoO9EWNPxFIjgRcLwZasJfZS8x3Kgb6r3NGqxw3tfpFIE5sg 9qr6yhtvxO1BOnrs5UxTd9wwfvtbcBQi0z0rkOO2EPnf573pDepL7Fb9s9cwszXCM8Y9 CwXMYazF01ELhznp5ygL+DsouVbmYhroRxKf0JpOlNSwjdblZYZawIa9SedCu3cx5JA0 xV05R2GmAVRwtAK/Mf9Bej/Lvr8eAv/m8TVwWIShKakWqa0qZ9FYJsBegv0ckk0wTkQr CSvG+YqSUunJcBmwx4wZwpNm0Pw82UV3lAZacfjzjCa3PEUSKMDJYf4II7hFKOTAte2g sT5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747782887; x=1748387687; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yvD/fN8Sp9JWD+l5+6d8ZeUgil5q7lzYae0IXW3AWnc=; b=KB4Np7v5rm1qCPv6PtYbAJhDdPRoDq2AdxJQIXddMFIrEezvyOBjVVWhZx6AM4nskM N4hGZ7oSGp2b/QCT/wM0QCgK/xRbzKi+FLsb+w6UkWBDCDWNtrJzXox7teMbSe9IO3CB bdCfM4B65IoYdOFbPiN+Nld1mM8X2OZkYiE0/o5+v46tBMjg90H0heIfWNfBGorjhoMT FnUDMaA9JWUWMbYEbiEeE1IBM4Y1/w73TuCO8B7iK/I3CpHO/HBwCsTIUAExF21mhxRk isFqGco+069guE9Sf8BHEguQ5ZQxnQkNhpEjIIJwqlwKYimD3QG1l8cYoHIKNHwYUcmF +K/w== X-Gm-Message-State: AOJu0YyTI1z9zvp8n4GKwK9JL96KrVIVLmhF/ZH7kPotXkDZDupgkHk7 YXE4giKcgjY4q+T6FcpugNfaK1uiAHyVzDbOmQBhtlZqIvLoyCGaW9DANrdMF04cPsI= X-Gm-Gg: ASbGncvX6kZwhnUvYgumzk9UQkqmJFzXkKrCMzjM60BUeaI7w+mT2lb/+GDty7iKx+G HHZTd2GxfMXCp5Nygnlz2n6r6xURSuMEWbcLB1At0ZrOeb6nl6TD+V1Le/9RWlb60xtzbMucWCQ X2LCz/Tgu/sUqeDl2VSQO6t5h2tyasTfp2VhntZazXt5utRoWgF+x7S3EDVOALTrsRro8gJGaoO odz2VxjOe04KeUYHFPWsR9Lc0/ua5OWr1JUFZahQIn7SKFEFeym0UZsjCdnCwRu5smbj3WpVpSU Hp3m2qORFCJL7Gt/FrmEhih/GragiszLbdkD4caMsoD4cD0JMeBuqBgpdUvzIQI1GsHuSNMp X-Google-Smtp-Source: AGHT+IHeOpzSh2xH1d+3wi1l3bcEpFuk2VPpgfEkz4giTb3e6EAA5aXgqjFk0hX0mnTBDtOn1gEWZg== X-Received: by 2002:ac8:5c95:0:b0:48a:2429:9dc1 with SMTP id d75a77b69052e-494ae3528f3mr296529891cf.9.1747782887354; Tue, 20 May 2025 16:14:47 -0700 (PDT) Received: from terra (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd468b844bsm799629885a.87.2025.05.20.16.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 16:14:46 -0700 (PDT) From: Maxim Cournoyer To: Sergey Trofimov Subject: Re: bug#78428: [PATCH] gnu: elogind: Adjust patch for pkttyagent path. In-Reply-To: <4e1577448b55f358096ae0b2d1b129d9633f9b03.1747416477.git.sarg@sarg.org.ru> (Sergey Trofimov's message of "Fri, 16 May 2025 19:28:30 +0200") References: <4e1577448b55f358096ae0b2d1b129d9633f9b03.1747416477.git.sarg@sarg.org.ru> Date: Wed, 21 May 2025 08:14:43 +0900 Message-ID: <87r00ian8c.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78428-done Cc: 78428-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Sergey Trofimov writes: > * gnu/packages/freedesktop.scm (elogind/fixed): New variable. > [#:phases]: 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