unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [PATCH 3/5] gnu: python-wheel: Define 'python2-variant'.
Date: Tue,  9 Feb 2016 03:11:01 -0500	[thread overview]
Message-ID: <9ab0a5111a1fd1d8c3724e1f0b49190174079a6b.1455005066.git.leo@famulari.name> (raw)
In-Reply-To: <cover.1455005066.git.leo@famulari.name>
In-Reply-To: <cover.1455005066.git.leo@famulari.name>

* gnu/packages/python.scm (python-wheel)[properties]: New field.
(python2-wheel): Use 'strip-python2-variant'.
---
 gnu/packages/python.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0a90e48..4d6b1f7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2141,16 +2141,16 @@ packages will be properly installed with only the @code{Unpack} step and the
 unpacked archive preserves enough information to @code{Spread} (copy data and
 scripts to their final locations) at any later time.  Wheel files can be
 installed with a newer @code{pip} or with wheel's own command line utility.")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-wheel))))))
 
 (define-public python2-wheel
-  (let ((wheel (package-with-python2 python-wheel)))
+  (let ((wheel (package-with-python2
+                (strip-python2-variant python-wheel))))
     (package (inherit wheel)
-      (native-inputs
-       `(("python2-functools32" ,python2-functools32)
-         ("python2-jsonschema" ,python2-jsonschema)
-         ,@(alist-delete "python-jsonschema"
-                         (package-native-inputs wheel)))))))
+      (native-inputs `(("python2-functools32" ,python2-functools32)
+                        ,@(package-native-inputs wheel))))))
+
 
 (define-public python-requests
   (package
-- 
2.6.3

  parent reply	other threads:[~2016-02-09  8:11 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-09  8:10 [PATCH 0/5] python2-variants Leo Famulari
2016-02-09  8:10 ` [PATCH 1/5] gnu: python-cryptography: Define 'python2-variant' Leo Famulari
2016-02-11 19:05   ` Efraim Flashner
2016-02-09  8:11 ` [PATCH 2/5] gnu: python-jsonschema: " Leo Famulari
2016-02-10 21:21   ` Ludovic Courtès
2016-02-11 19:10   ` Efraim Flashner
2016-02-09  8:11 ` Leo Famulari [this message]
2016-02-09  8:30   ` [PATCH 3/5] gnu: python-wheel: " Leo Famulari
2016-02-10 21:22   ` Ludovic Courtès
2016-02-11 19:13   ` Efraim Flashner
2016-02-09  8:11 ` [PATCH 4/5] gnu: python-requests: " Leo Famulari
2016-02-09  8:29   ` Leo Famulari
2016-02-10 21:23   ` Ludovic Courtès
2016-02-11 19:14   ` Efraim Flashner
2016-02-09  8:11 ` [PATCH 5/5] gnu: Split acme into python-acme and python2-acme Leo Famulari
2016-02-10 21:24   ` Ludovic Courtès
2016-02-10 21:21 ` [PATCH 0/5] python2-variants Ludovic Courtès
2016-02-12 23:56   ` Leo Famulari
2016-02-13 21:26     ` Efraim Flashner
2016-02-11 19:07 ` Efraim Flashner
2016-02-12  2:34   ` Leo Famulari

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=9ab0a5111a1fd1d8c3724e1f0b49190174079a6b.1455005066.git.leo@famulari.name \
    --to=leo@famulari.name \
    --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).