From 458480235b85ce31db5485251f94415cfdddeff0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 15 May 2016 11:51:54 +0200 Subject: [PATCH] gnu: python: Add 'python' variables for different major/minor versions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-2): Rename variable to... (python-2.7): ...this. (python-2): Refer to "python-2.7". (python): Rename variable to... (python-3.4): ...this. (python-3): Refer to "python-3.4". (python): Refer to "python-3". Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1929f83a16..37c8594a37 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -90,7 +90,7 @@ (define-module (gnu packages python) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1)) -(define-public python-2 +(define-public python-2.7 (package (name "python") (version "2.7.10") @@ -262,7 +262,10 @@ (define-public python-2 data types.") (license psfl))) -(define-public python +;; Current 2.x version. +(define-public python-2 python-2.7) + +(define-public python-3.4 (package (inherit python-2) (version "3.4.3") (source (origin @@ -288,6 +291,12 @@ (define-public python (version-major+minor version) "/site-packages")))))))) +;; Current 3.x version. +(define-public python-3 python-3.4) + +;; Current major version. +(define-public python python-3) + ;; Minimal variants of Python, mostly used to break the cycle between Tk and ;; Python (Tk -> libxcb -> Python.)