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 ms11 with LMTPS id AEhAHd+GlF92HQAA0tVLHw (envelope-from ) for ; Sat, 24 Oct 2020 19:56:15 +0000 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 QO0YGd+GlF/SFQAA1q6Kng (envelope-from ) for ; Sat, 24 Oct 2020 19:56:15 +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 DE1D69402A0 for ; Sat, 24 Oct 2020 19:56:14 +0000 (UTC) Received: from localhost ([::1]:34824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWPe9-0002hg-SP for larch@yhetil.org; Sat, 24 Oct 2020 15:56:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWPdy-0002gB-Vc for guix-patches@gnu.org; Sat, 24 Oct 2020 15:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWPdy-0008WR-Hv for guix-patches@gnu.org; Sat, 24 Oct 2020 15:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWPdy-0002k1-Ga for guix-patches@gnu.org; Sat, 24 Oct 2020 15:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44170] [PATCH] gnu: Correct Inkscape extension dependencies Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Oct 2020 19:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44170 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: "44170@debbugs.gnu.org" <44170@debbugs.gnu.org> Received: via spool by 44170-submit@debbugs.gnu.org id=B44170.160356932710492 (code B ref 44170); Sat, 24 Oct 2020 19:56:02 +0000 Received: (at 44170) by debbugs.gnu.org; 24 Oct 2020 19:55:27 +0000 Received: from localhost ([127.0.0.1]:35226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWPdP-0002j9-0f for submit@debbugs.gnu.org; Sat, 24 Oct 2020 15:55:27 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWPdM-0002iz-On for 44170@debbugs.gnu.org; Sat, 24 Oct 2020 15:55:25 -0400 Received: from localhost (92.41.179.191.threembb.co.uk [92.41.179.191]) by mira.cbaines.net (Postfix) with ESMTPSA id B640927BBF0; Sat, 24 Oct 2020 20:55:23 +0100 (BST) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 437ec91d; Sat, 24 Oct 2020 19:55:21 +0000 (UTC) References: User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: Date: Sat, 24 Oct 2020 20:55:18 +0100 Message-ID: <87mu0bbdqx.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -3.11 X-TUID: pq/eCd44GT3L --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ekaitz Zarraga writes: > Updated with file-name thanks to Christopher Baines' help. > > Guix lint is not complaining anymore about the file name. > > (it complains about the version but it's because of a bad naming system > upstream) I've had a proper look at this patch now. In general, especially for adding new packages, do one thing per commit. I've split out the addition of python-scour in to it's own commit and pushed that now. I had some thoughts on the inkscape changes though. > From 931147a8dfe30f96e634a9aabc58955d2ff1b475 Mon Sep 17 00:00:00 2001 > From: Ekaitz Zarraga > Date: Wed, 21 Oct 2020 19:08:20 +0200 > Subject: [PATCH] gnu: Correct Inkscape extension dependencies > > * gnu/packages/inkscape.scm (inkscape@1.0.1): Add dependencies. > * gnu/packages/python-xyz.scm (python-scour): New variable. > --- > gnu/packages/inkscape.scm | 28 ++++++++++++++++++++++++++-- > gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ > 2 files changed, 53 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm > index 4ac3cf3966..85b4b5020f 100644 > --- a/gnu/packages/inkscape.scm > +++ b/gnu/packages/inkscape.scm > @@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2020 Maxim Cournoyer > ;;; Copyright =C2=A9 2020 Boris A. Dekshteyn > +;;; Copyright =C2=A9 2020 Ekaitz Zarraga > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -44,6 +45,7 @@ > #:use-module (gnu packages pdf) > #:use-module (gnu packages popt) > #:use-module (gnu packages python) > + #:use-module (gnu packages python-xyz) > #:use-module (gnu packages xml) > #:use-module (gnu packages ghostscript) > #:use-module (gnu packages fontutils) > @@ -250,7 +252,25 @@ endif()~%~%" > (add-after 'install 'glib-or-gtk-compile-schemas > (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-= schemas)) > (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap > - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) > + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) > + (add-after 'install 'wrap-program > + ;; Ensure correct Python at runtime. > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (python (assoc-ref inputs "python")) > + (file (string-append out "/bin/inkscape")) > + (path (string-append > + out > + "/lib/python" > + ,(version-major+minor > + (package-version python)) > + "/site-packages:" I had a look in the output, and it doesn't contain lib/python, so this bit won't do anything as far as I can see? The PYTHONPATH bit is fine. > + (getenv "PYTHONPATH")))) > + (wrap-program file > + `("PYTHONPATH" ":" prefix (,path)) > + `("PATH" ":" prefix > + (,(string-append python "/bin:"))))) The : after /bin is unnecessary. Also, it looks like python-wrapper is already referenced lots in the output, did you have a specific reason why wrapping inkscape with the PATH was useful? > + #t))))) > (inputs > `(("aspell" ,aspell) > ("autotrace" ,autotrace) > @@ -283,7 +303,11 @@ endif()~%~%" > ("googletest" ,googletest) > ("perl" ,perl) > ("pkg-config" ,pkg-config) > - ("python" ,python-wrapper))) > + ("python" ,python-wrapper) > + ("python-scour" ,python-scour) > + ("python-pyserial" ,python-pyserial) > + ("python-numpy" ,python-numpy) > + ("python-lxml" ,python-lxml))) So, before python-wrapper was a native-input, and you've added some Python packages as native inputs. The distinction for inkscape between an input and a native input is mostly academic at this point, because the meson build system doesn't support cross builds. However, inkscape already uses references python-wrapper in its output, so it should probably be an input. With this change, you're also setting out that inkscape should be able to use these Python libraries at runtime, hence they should be inputs (matching the architecture you're building for), rather than native inputs (matching the architecture you're building on). Does that make sense? Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+UhqdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xc9gxAAjLDLXqVqwcsd5lhpT+RKC7mYNjYh1FaE ilXkdp+3FwZMux8lkpqACqwI7E5kHmp1JhD0j6PyD8yxzBHle+jfsbN5HJ5lgIS9 Nhbe5MwZcFjpPXzZSNj44fTRi+7kxefyLHu/1nOmtO6uMQsRVsb1jKZh0IbO1V6z AuMtK73upBCOqxyeG4AJgEspTEAYq75IgQ64zeZIemSYkSf5Zl2qhVTQYogdZRXD UMCsNI1MJ0anRU6M+g+kLtAQxP+59MIIk1764GvJzGQm3+56WkdKlL5DvLnFf+8Y JU/WqvaRq1n8dW01VLhGVhetUHTqEQX2R+uoQZ9SG2pSBiUQvR1Jv4u2IFeHKeYt Las5xG666dXNspR8FTQcOLkbQCWaa+BFvc+DM5pRroGUxSVsibLM5qGuYLGRrs4C qoNZNKqnVuPxtpvPxU6kThnWfx9accF5NLfuU1kY5wEhZRDxRWXni4xhRmwkisK2 XO7Z5aiuS7e1A1nmOMCcakV+/ElCutqY/4kXzOUYKKDGKFoDATi+oFel//3M0Qs1 cEw2LFBmxY5v39yQeC396ADNfW293aWgoRSvlu7gEQBuU88w7trh1YIp/aAb+iIe CSNG2Gr+DfWNUPnO5SojyaQlC4hyGHTn8JeD58FJndj8xDxCNaE54J3sKA/4ustS QLclbqq9VeM= =/E54 -----END PGP SIGNATURE----- --=-=-=--