diff mbox

: gnu: python-jsonschema: Correct inputs.

Message ID 87wpge6joe.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me
State New
Headers show

Commit Message

Marius Bakke Nov. 8, 2016, 4:05 p.m. UTC
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).

Comments

Leo Famulari Nov. 8, 2016, 5:30 p.m. UTC | #1
On Tue, Nov 08, 2016 at 04:05:53PM +0000, Marius Bakke wrote:
> 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).
> 

> From 929b9caa995cc0b75a8a5cd8d4b85102c240d2f6 Mon Sep 17 00:00:00 2001
> From: Marius Bakke <mbakke@fastmail.com>
> 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.

It works for me, thanks!

Hartmut, what do you think?
Hartmut Goebel Nov. 8, 2016, 6:15 p.m. UTC | #2
Am 08.11.2016 um 18:30 schrieb Leo Famulari:
>> > * 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.
> It works for me, thanks!
>
> Hartmut, what do you think?

LGTM
Marius Bakke Nov. 8, 2016, 6:27 p.m. UTC | #3
Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> Am 08.11.2016 um 18:30 schrieb Leo Famulari:
>>> > * 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.
>> It works for me, thanks!
>>
>> Hartmut, what do you think?
>
> LGTM

OK! Pushed along with updates to python-tempest-lib and python-os-testr.
diff mbox

Patch

From 929b9caa995cc0b75a8a5cd8d4b85102c240d2f6 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
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