Patchwork gnu: python: Variable names containing versions

login
register
mail settings
Submitter Hartmut Goebel
Date May 18, 2016, 5:01 p.m.
Message ID <1463590899-13755-1-git-send-email-h.goebel@crazy-compilers.com>
Download mbox | patch
Permalink /patch/12348/
State New
Headers show

Comments

Hartmut Goebel - May 18, 2016, 5:01 p.m.
Hi,

as discussed earlier on the mailinglist, here is a patch adding "versioned"
Python variables.

python -> python-3 -> python-3.4
python-2 -> python-2.7

This allows to still specify "current Python 3.4.x release" even after we
updated python-3 to python-3.5. python-2.7 is for symetry only, as there will
be no Python 2.8.

>From 793917a37a32d89d98da93a1315635d4506f40c1 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Sun, 15 May 2016 11:51:54 +0200
Subject: [PATCH] gnu: python: Variable names containing versions

* 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".
---
 gnu/packages/python.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
Ludovic Courtès - May 19, 2016, 12:27 p.m.
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> as discussed earlier on the mailinglist, here is a patch adding "versioned"
> Python variables.
>
> python -> python-3 -> python-3.4
> python-2 -> python-2.7
>
> This allows to still specify "current Python 3.4.x release" even after we
> updated python-3 to python-3.5. python-2.7 is for symetry only, as there will
> be no Python 2.8.
>
>>From 793917a37a32d89d98da93a1315635d4506f40c1 Mon Sep 17 00:00:00 2001
> From: Hartmut Goebel <h.goebel@crazy-compilers.com>
> Date: Sun, 15 May 2016 11:51:54 +0200
> Subject: [PATCH] gnu: python: Variable names containing versions
>
> * 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".

Applied (I slightly tweaked the comments).  Thanks!

Ludo’.

Patch

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7593fc7..08065ea 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -90,7 +90,7 @@ 
   #: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,9 @@  packages; exception-based error handling; and very high level dynamic
 data types.")
     (license psfl)))
 
-(define-public python
+(define-public python-2 python-2.7)
+
+(define-public python-3.4
   (package (inherit python-2)
     (version "3.4.3")
     (source (origin
@@ -288,6 +290,12 @@  data types.")
                                         (version-major+minor version)
                                         "/site-packages"))))))))
 
+; our current Python 3 release is Python 3.4
+(define-public python-3 python-3.4)
+
+; our current default python is python 3
+(define-public python python-3)
+
 ;; Minimal variants of Python, mostly used to break the cycle between Tk and
 ;; Python (Tk -> libxcb -> Python.)