From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: [PATCH]: gnu: python-jsonschema: Correct inputs. Date: Tue, 08 Nov 2016 16:05:53 +0000 Message-ID: <87wpge6joe.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:32875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c48uZ-000333-0F for guix-devel@gnu.org; Tue, 08 Nov 2016 11:06:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c48uT-0003Fh-A0 for guix-devel@gnu.org; Tue, 08 Nov 2016 11:06:10 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45523) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c48uT-0003FN-17 for guix-devel@gnu.org; Tue, 08 Nov 2016 11:06:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id BDE6720987 for ; Tue, 8 Nov 2016 11:06:04 -0500 (EST) Received: from localhost (169.243.187.81.in-addr.arpa [81.187.243.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 4EF01CC0B7 for ; Tue, 8 Nov 2016 11:06:00 -0500 (EST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Hello Guix, This fixes a problem building python2-tempest-lib due to missing propagation of python2-functools32. Note that the native-inputs are still referenced due to a bug with how the automatic wrapper of $out/bin works. Should they still be added as regular inputs, or can we ignore it for now? I *think* this is fixed in wip-python-build-system, but haven't checked yet (still building dependents). --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-python-jsonschema-Correct-inputs.patch >From 929b9caa995cc0b75a8a5cd8d4b85102c240d2f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Nov 2016 15:50:13 +0000 Subject: [PATCH] gnu: python-jsonschema: Correct inputs. * gnu/packages/python.scm (python-jsonschema)[inputs]: Remove python-setuptools. Move python-vcversioner to ... [native-inputs]: ... here. * gnu/packages/python.scm (python2-jsonschema)[inputs]: Move python2-functools32 to ... [propagated-inputs]: ... here. [native-inputs]: Add python2-setuptools. --- gnu/packages/python.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5b5287e..8407b2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2474,9 +2474,8 @@ version numbers.") (base32 "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools) - ("python-vcversioner" ,python-vcversioner))) + (native-inputs + `(("python-vcversioner" ,python-vcversioner))) (home-page "http://github.com/Julian/jsonschema") (synopsis "Implementation of JSON Schema for Python") (description @@ -2488,9 +2487,11 @@ version numbers.") (let ((jsonschema (package-with-python2 (strip-python2-variant python-jsonschema)))) (package (inherit jsonschema) - (inputs - `(("python2-functools32" ,python2-functools32) - ,@(package-inputs jsonschema)))))) + (native-inputs + `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs jsonschema))) + (propagated-inputs + `(("python2-functools32" ,python2-functools32)))))) (define-public python-unidecode (package -- 2.10.2 --=-=-=--