From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0MBz-0002QI-GS for guix-patches@gnu.org; Fri, 06 Oct 2017 02:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0MBy-0004Lj-Ea for guix-patches@gnu.org; Fri, 06 Oct 2017 02:33:03 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e0MBy-0004LJ-BQ for guix-patches@gnu.org; Fri, 06 Oct 2017 02:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e0MBy-0000ls-2Z for guix-patches@gnu.org; Fri, 06 Oct 2017 02:33:02 -0400 Subject: [bug#28693] [PATCH] gnu: Add missing input to python-py3status and fix call path. Resent-Message-ID: Date: Fri, 6 Oct 2017 07:32:50 +0100 From: Christopher Baines Message-ID: <20171006073250.4ecbd100@cbaines.net> In-Reply-To: <20171005212439.26407-1-sleep_walker@gnu.org> References: <20171004075944.1e5a7cbf@cbaines.net> <20171005212439.26407-1-sleep_walker@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/1v6rAbrwWNG2STEGZoVefcv"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: =?UTF-8?Q?Tom=C3=A1=C5=A1_?= =?UTF-8?Q?=C4=8Cech?= Cc: 28693@debbugs.gnu.org --Sig_/1v6rAbrwWNG2STEGZoVefcv Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 5 Oct 2017 23:24:39 +0200 Tom=C3=A1=C5=A1 =C4=8Cech wrote: > * gnu/packages/python.scm (python-py3status)[inputs, arguments]: Add > missing file utility as input, adjust path used to call it. I would usually put the changelog last, as I think this is more consistent with other committers. Also, maybe this could be more specific like: * gnu/packages/python.scm (python-py3status)[inputs]: Add file. [arguments]: Modify phases to patch py3status to call file with an absolute path. > file is used to determine configuration file encoding and py3status > fails to start when this tool is missing. > --- > gnu/packages/python.scm | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 6ffd468b3..426ff12eb 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -11468,8 +11468,21 @@ to occurrences in strings and comments.") > (base32 > "0i283z1pivmir61z8kbiycigc94l61v33ygzkhczf1ifq7cppyds")))) > (build-system python-build-system) > + (inputs > + `(("file" ,file))) > (arguments > - '(#:tests? #f)) ; TODO: Requires many libraries not in Guix. > + '(#:phases > + (modify-phases %standard-phases > + ;; 'file' is used for detection of configuration file > encoding > + ;; let's make link the dependency to particular input > + (add-before 'build 'patch-file-path > + (lambda* (#:key inputs #:allow-other-keys) > + (let ((file-path (assoc-ref inputs "file"))) > + (substitute* "py3status/parse_config.py" > + (("check_output\\(\\['file'") > + (string-append "check_output(['" file-path > "/bin/file'"))) > + #t)))) > + #:tests? #f)) ; TODO: Requires many libraries not in Guix. > (home-page "https://github.com/ultrabug/py3status") > (synopsis "Extensible i3status wrapper written in Python") > (description "py3status is an i3status wrapper which extends > i3status This change looks fine to me, and I checked that it builds as well. Please push :) --Sig_/1v6rAbrwWNG2STEGZoVefcv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnXI5JfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xfd6Q/9GiXUlG7vbV9k4iiMcJkJqcpyoGzENzXXsxNalc0rxPfbHa98TgV+7ucN VRrz4YNhdvsdfvgyvSo5dWjG3BXT8FPbP58p1XRNZyJkBaVYQHKiqZfLtlQ9AV2P VmI3rD6Mc2dI+7HTR2ma9BI0XCmoLqq7ZXeTObQmiWcGtrx6/y+JcepIJm2xikwf 123MyBZlYdIV8rjIYiDp3T6ft7f++WjOoid9xWozsIklIDBeiNXWTQlb+/kjMCU+ L7xuHOHnCnVujcuqaBiH3AZd0ChlY1KWN7LfK0C1zNmWJcfEQFa17gwVzhmemwfo KgdanJYhmyoHkHmFNt8pMyxWmRwQgmarIHyzjcGOqpB8NgKVm6AJFoGC9l156Ewl IPcFnOxTVWV0jNlr6rN3o4jKaMaaKgqo7kHpyatC/1XtShENa1yP4xxqSQWpgAPj Hgmf46QPZhal0yX43sHeIkzmuJ8jAKla6BHf3m2xc34qjCathdmy1zlVEwFx8llL WubO8cCrR5BgaO5Z46F1YTJB0EFcAj9CbShzUtNEaTQJCcK1h635J6SISLczrGSt pDLNq13gbOlW13MC3pjzBL++jLeqqqm28vdCMFAIbGPpcCi5ZmFSqOjJYLwZWuWR H0LLcyz8oxptU5rEeLOnha0fA98WQzDHPXLzpl/w2iICwpRJQfE= =Xh4g -----END PGP SIGNATURE----- --Sig_/1v6rAbrwWNG2STEGZoVefcv--