diff options
| author | Dario Bertini <dario.bertini@nccgroup.com> | 2015-01-24 10:38:54 +0000 |
|---|---|---|
| committer | Dario Bertini <dario.bertini@nccgroup.com> | 2015-01-24 10:38:54 +0000 |
| commit | 57577f201963fae13612729c51b16d94e22033b4 (patch) | |
| tree | 1343c58fa5496f575ab003f6e865087e467f24f4 /pkgs/development/interpreters/python | |
| parent | 5ca36481372d0f6c5f83acdacde1044eeeffe07b (diff) | |
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds
Diffstat (limited to 'pkgs/development/interpreters/python')
5 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 87e4dceee4d76..9bf161ffc1aad 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -56,6 +56,7 @@ let # external dependencies. python = stdenv.mkDerivation { name = "python${if includeModules then "" else "-minimal"}-${version}"; + pythonVersion = majorVersion; inherit majorVersion version src patches buildInputs preConfigure; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 117d11f305251..0d7490d910c15 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -55,6 +55,7 @@ let # external dependencies. python = stdenv.mkDerivation { name = "python-${version}"; + pythonVersion = majorVersion; inherit majorVersion version src patches buildInputs preConfigure; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index d3f5c6e1f138d..2645b50334404 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -27,6 +27,7 @@ let in stdenv.mkDerivation { name = "python3-${version}"; + pythonVersion = majorVersion; inherit majorVersion version; src = fetchurl { diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 1f91d1bbaf436..a8953f38245a0 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -20,6 +20,7 @@ with stdenv.lib; let majorVersion = "3.3"; + pythonVersion = majorVersion; version = "${majorVersion}.6"; buildInputs = filter (p: p != null) [ @@ -28,6 +29,7 @@ let in stdenv.mkDerivation { name = "python3-${version}"; + pythonVersion = majorVersion; inherit majorVersion version; src = fetchurl { diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 8c86f77ff756f..5c99428463d72 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -20,6 +20,7 @@ with stdenv.lib; let majorVersion = "3.4"; + pythonVersion = majorVersion; version = "${majorVersion}.2"; fullVersion = "${version}"; @@ -29,6 +30,7 @@ let in stdenv.mkDerivation { name = "python3-${fullVersion}"; + pythonVersion = majorVersion; inherit majorVersion version; src = fetchurl { |