From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UE/cJBAAi2F7fgAAgWs5BA (envelope-from ) for ; Wed, 10 Nov 2021 00:11:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ULp6IBAAi2GUSAAA1q6Kng (envelope-from ) for ; Tue, 09 Nov 2021 23:11:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 03739ED7B for ; Wed, 10 Nov 2021 00:11:12 +0100 (CET) Received: from localhost ([::1]:45290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkaGl-0000lY-84 for larch@yhetil.org; Tue, 09 Nov 2021 18:11:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkaGd-0000lO-0D for bug-guix@gnu.org; Tue, 09 Nov 2021 18:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkaGc-0002Wf-Lf for bug-guix@gnu.org; Tue, 09 Nov 2021 18:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mkaGc-0007Tp-7I for bug-guix@gnu.org; Tue, 09 Nov 2021 18:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 09 Nov 2021 23:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51731 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 51731@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163649944828731 (code B ref -1); Tue, 09 Nov 2021 23:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Nov 2021 23:10:48 +0000 Received: from localhost ([127.0.0.1]:36185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkaGN-0007TK-Em for submit@debbugs.gnu.org; Tue, 09 Nov 2021 18:10:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:46948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkaGL-0007TA-Mg for submit@debbugs.gnu.org; Tue, 09 Nov 2021 18:10:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkaGL-0000ki-CQ for bug-guix@gnu.org; Tue, 09 Nov 2021 18:10:45 -0500 Received: from [2a00:5881:4008:2810::309] (port=49734 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mkaGI-0002Ut-Sb for bug-guix@gnu.org; Tue, 09 Nov 2021 18:10:45 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 16924a2b for ; Tue, 9 Nov 2021 23:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=lZrpbwxgajNbwB/Ab5kV03gT+OU=; b=sJToqQ/veWDZ8Ewxb3fnpCu2chNR KFvXjvNzc02yxvKHc580wCpMqcUO7di7dZp8EEindOoYSP2DJp/cQ+9y0bjnU+YM mekVL0vSiwL5xTLz1TOAhWmqoCniYie1Ode+36xmCZnQjkoEkwWhqgiatarvCSCC HSic8OxpTKEQq+Q= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e551c127 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Tue, 9 Nov 2021 23:10:35 +0000 (UTC) Date: Tue, 09 Nov 2021 23:10:29 +0000 Message-ID: <87pmr9x6vu.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Vivien Kraus From: Vivien Kraus via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636499472; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=IYMgOKbGQiJUsCtJCmtU/5DDFkIyG2gyhbtnzxN1Qig=; b=e2lqdrJ+ge8xVP/VOhH8VvL/+XI0D2PM0k/cviMUYluTYQ8OJSi3pimKiH09k3lXhANhxI 1FXeI/5J1p7mowATwhKY+0MpIAhuaEe93BVZQjLOH1vbyzxx8d+kqnofenZfp6WMws3Cos V9sjz/fVR0LIGQp02OitsYRqwWRbhh/RM5kb1963iMqcQfBpC3GTN/Vih8SaUPKOSTJDF9 cpliHZ20jWi9T1xy4/gcBPlnwiA7zHAtpte60e8lbf2Y9ugkEPHvfX76ba0gRUxIu7Ns5r wKMCdlzmzIqcc5s945eOBofFHs4VZx0CEwy8Q9HkvqYgGKa3sThDkpjZj2n6BQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636499472; a=rsa-sha256; cv=none; b=Hy0ZiNHa/GgttJm3Wt5y5CRTwnvl8doSQPrZc/j5DQtOWTnPFC2jrPexE/RMlO8JikSy9Z K9CFFNPgiuy1T+4XiAaf/3y49CpjMB8h1h7bPaxP8RgB1F4Yi+3qmNA0ohvFrjtP9iJyVX o9ulcjhT86Jy3X2kKOJQhVLkXJuy8OFvDNYDiavOeC26Cz6uBDcAe9sMulpni0a1cswEyI UlW8NZYVRSTN/SzWeLaySfwpJfOLhAHXCHHEgXZ+SuJREV9R1O3mfl7BqAc5BVV2YVv7Cy dmggbUgmmarPc5xO1hybyrE2v3ZMSPQ/fZMffwbFomtjLfcOyf6LeOxG3+sp3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="sJToqQ/v"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -5.62 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="sJToqQ/v"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 03739ED7B X-Spam-Score: -5.62 X-Migadu-Scanner: scn1.migadu.com X-TUID: CVuKr437CkQn --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dear guix, gnome-tweaks does not start on core-updates-frozen, because it needs libhandy 1 and is given libhandy 0.0. Also, it cannot find its own python module, so the python path needs to be wrapped. I fixed a couple of linter errors, and applied guix style to it. However, now the linter complains that we have the "bin" output of glib in something that would be called "glib" and not "glib:bin"=E2=80=A6 S= hould we still keep the styled output? Best regards, Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gnome-tweaks-Use-libhandy-1.patch Content-Transfer-Encoding: quoted-printable Content-Description: Update the libhandy dependency for gnome-tweaks From=204612c8235c14bcb9b7583746683e1d2559df390b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 9 Nov 2021 22:17:43 +0000 Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1. * gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhan= dy 0. =2D-- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3eafcc2f10..17dd87fd62 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9795,7 +9795,7 @@ (define-public gnome-tweaks ("gtk+" ,gtk+) ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libnotify" ,libnotify) ("libsoup" ,libsoup) ("nautilus" ,nautilus) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-gnome-tweaks-Set-the-python-path.patch Content-Transfer-Encoding: quoted-printable Content-Description: Wrap gnome-tweaks to set the python path too From=20cdb79baa5705adbfee8711e5698aa687fd3685f1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 9 Nov 2021 22:57:13 +0000 Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path. gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with GUIX_PYTHONPA= TH. =2D-- gnu/packages/gnome.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 17dd87fd62..f725dfe981 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9784,8 +9784,14 @@ (define-public gnome-tweaks (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) =2D (wrap-program (string-append out "/bin/gnome-tweaks") =2D `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))= )) + (let ((python-path + (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program (string-append out "/bin/gnome-tweaks") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("intltool" ,intltool) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-gnome-tweaks-gobject-introspection-should-be-a-n.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix a linter warning From=204f5dc6bdb473380619b42986097b56e1ea305f13 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 9 Nov 2021 22:39:57 +0000 Subject: [PATCH 3/5] gnu: gnome-tweaks: gobject-introspection should be a native input. * gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Move gobject-introspection= to a native input. =2D-- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f725dfe981..ab16157fb5 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9795,11 +9795,11 @@ (define-public gnome-tweaks (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("intltool" ,intltool) =2D ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection))) (inputs `(("gnome-desktop" ,gnome-desktop) ("gtk+" ,gtk+) =2D ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libhandy" ,libhandy) ("libnotify" ,libnotify) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-gnome-tweaks-Add-bash-minimal-as-an-input-to-wra.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix a linter warning From=20f45038630cff73514f24248684cb8c968106f225 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 9 Nov 2021 23:01:45 +0000 Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an input to wrap the program. * gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Add bash-minimal. =2D-- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab16157fb5..d0bd796fa4 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9806,7 +9806,8 @@ (define-public gnome-tweaks ("libsoup" ,libsoup) ("nautilus" ,nautilus) ("python" ,python) =2D ("python-pygobject" ,python-pygobject))) + ("python-pygobject" ,python-pygobject) + ("bash-minimal" ,bash-minimal))) (synopsis "Customize advanced GNOME 3 options") (home-page "https://wiki.gnome.org/Apps/Tweaks") (description =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-gnome-tweaks-Style-it.patch Content-Transfer-Encoding: quoted-printable Content-Description: Apply guix style to gnome-tweaks From=204c5d8d919d433d0669abc124eeb2692ae81739f5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 9 Nov 2021 23:04:59 +0000 Subject: [PATCH 5/5] gnu: gnome-tweaks: Style it. * gnu/packages/gnome.scm (gnome-tweaks): Apply the Guix style. =2D-- gnu/packages/gnome.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d0bd796fa4..785492b186 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9793,21 +9793,19 @@ (define-public gnome-tweaks `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))) (native-inputs =2D `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. =2D ("intltool" ,intltool) =2D ("pkg-config" ,pkg-config) =2D ("gobject-introspection" ,gobject-introspection))) =2D (inputs =2D `(("gnome-desktop" ,gnome-desktop) =2D ("gtk+" ,gtk+) =2D ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) =2D ("libhandy" ,libhandy) =2D ("libnotify" ,libnotify) =2D ("libsoup" ,libsoup) =2D ("nautilus" ,nautilus) =2D ("python" ,python) =2D ("python-pygobject" ,python-pygobject) =2D ("bash-minimal" ,bash-minimal))) + (list `(,glib "bin") ; for glib-compile-resources, etc. + intltool pkg-config gobject-introspection)) + (inputs + (list gnome-desktop + gtk+ + gsettings-desktop-schemas + libhandy + libnotify + libsoup + nautilus + python + python-pygobject + bash-minimal)) (synopsis "Customize advanced GNOME 3 options") (home-page "https://wiki.gnome.org/Apps/Tweaks") (description =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGK/+UACgkQO7C8EjLY uCz02wwA1krPKWO/WDD2UiMCUw9Ohh82QUffnKVp3nPO7TiPsvYJTVa1pT0+sMRV UvHVsS/Rk3F0jdxYogVRYf0L0Gz57kOXl3wt1oXWJQIm5h5p8mr399Nig2ZA/lki CF3GWnr7cEbPJVeMzgowzjtVTe2GekFppuVwNWqFnCFfP+/y2rz0QsYaSiBcUZGa kdGSwJJLLrFQMErZcGdkYhaxdYDlMLUgKluQ2jPyvUk+3+AFxZ6mXdZaSpRxKrZe IA1FxODeadgef4ZWSl1e15bSzm8X/iwkun6/wH67T1k+MC/pG0EawUkVAKKN1UzB OAlE+SCAwrageX4gk1vne6iUvgCxyEMqrsWTAe8wUCTIn/s0P3tgFi4Vyp3E6cdr 6xLQ2LXcddf5rAtx+NuaYzI084AT1CM6LGQrRwR1a3nq5vd9t97fobvBnXQaMIlT 8RfDBJfrLBrwsHhQFcUk82vls1VRxQl8oI8zX6n4KEzvu1ELgmVOCy9PZysoTP5I KgQc/RsG =j/9f -----END PGP SIGNATURE----- --==-=-=--