[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH]: gnu: python-jsonschema: Correct inputs.
From: |
Marius Bakke |
Subject: |
[PATCH]: gnu: python-jsonschema: Correct inputs. |
Date: |
Tue, 08 Nov 2016 16:05:53 +0000 |
User-agent: |
Notmuch/0.23.1 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) |
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).
>From 929b9caa995cc0b75a8a5cd8d4b85102c240d2f6 Mon Sep 17 00:00:00 2001
From: Marius Bakke <address@hidden>
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
- [PATCH]: gnu: python-jsonschema: Correct inputs.,
Marius Bakke <=