mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds
This commit is contained in:
parent
5ca3648137
commit
57577f2019
@ -8,11 +8,11 @@ let
|
||||
|
||||
majorVersion = "2.4";
|
||||
version = "${majorVersion}.0";
|
||||
pythonVersion = "2.7";
|
||||
libPrefix = "pypy${majorVersion}";
|
||||
|
||||
pypy = stdenv.mkDerivation rec {
|
||||
name = "pypy-${version}";
|
||||
pythonVersion = "2.7";
|
||||
|
||||
inherit majorVersion version;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -55,6 +55,7 @@ let
|
||||
# external dependencies.
|
||||
python = stdenv.mkDerivation {
|
||||
name = "python-${version}";
|
||||
pythonVersion = majorVersion;
|
||||
|
||||
inherit majorVersion version src patches buildInputs preConfigure;
|
||||
|
||||
|
@ -27,6 +27,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "python3-${version}";
|
||||
pythonVersion = majorVersion;
|
||||
inherit majorVersion version;
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -3,6 +3,8 @@
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
pythonAtLeast = versionAtLeast python.pythonVersion;
|
||||
pythonOlder = versionOlder python.pythonVersion;
|
||||
isPy26 = python.majorVersion == "2.6";
|
||||
isPy27 = python.majorVersion == "2.7";
|
||||
isPy33 = python.majorVersion == "3.3";
|
||||
@ -2995,7 +2997,7 @@ let
|
||||
name = "pew-0.1.14";
|
||||
namePrefix = "";
|
||||
|
||||
disabled = isPy26 || isPy27 || isPy33; # old versions require backported libraries
|
||||
disabled = pythonOlder "3.4"; # old versions require backported libraries
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz";
|
||||
|
Loading…
Reference in New Issue
Block a user