unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Marius Bakke <mbakke@fastmail.com>
To: guix-devel@gnu.org
Subject: [PATCH]: gnu: python-jsonschema: Correct inputs.
Date: Tue, 08 Nov 2016 16:05:53 +0000	[thread overview]
Message-ID: <87wpge6joe.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (raw)

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]


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).


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-jsonschema-Correct-inputs.patch --]
[-- Type: text/x-patch, Size: 1862 bytes --]

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


             reply	other threads:[~2016-11-08 16:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-08 16:05 Marius Bakke [this message]
2016-11-08 17:30 ` [PATCH]: gnu: python-jsonschema: Correct inputs Leo Famulari
2016-11-08 18:15   ` Hartmut Goebel
2016-11-08 18:27     ` Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wpge6joe.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me \
    --to=mbakke@fastmail.com \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).