Merge pull request #5876 from berdario/pew

Update pew to 0.1.14
This commit is contained in:
Domen Kožar 2015-01-24 20:02:20 +01:00
commit 8270a5f0eb
7 changed files with 18 additions and 5 deletions

View file

@ -8,11 +8,11 @@ let
majorVersion = "2.4"; majorVersion = "2.4";
version = "${majorVersion}.0"; version = "${majorVersion}.0";
pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}"; libPrefix = "pypy${majorVersion}";
pypy = stdenv.mkDerivation rec { pypy = stdenv.mkDerivation rec {
name = "pypy-${version}"; name = "pypy-${version}";
pythonVersion = "2.7";
inherit majorVersion version; inherit majorVersion version;

View file

@ -56,6 +56,7 @@ let
# external dependencies. # external dependencies.
python = stdenv.mkDerivation { python = stdenv.mkDerivation {
name = "python${if includeModules then "" else "-minimal"}-${version}"; name = "python${if includeModules then "" else "-minimal"}-${version}";
pythonVersion = majorVersion;
inherit majorVersion version src patches buildInputs preConfigure; inherit majorVersion version src patches buildInputs preConfigure;

View file

@ -55,6 +55,7 @@ let
# external dependencies. # external dependencies.
python = stdenv.mkDerivation { python = stdenv.mkDerivation {
name = "python-${version}"; name = "python-${version}";
pythonVersion = majorVersion;
inherit majorVersion version src patches buildInputs preConfigure; inherit majorVersion version src patches buildInputs preConfigure;

View file

@ -27,6 +27,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "python3-${version}"; name = "python3-${version}";
pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
src = fetchurl { src = fetchurl {

View file

@ -20,6 +20,7 @@ with stdenv.lib;
let let
majorVersion = "3.3"; majorVersion = "3.3";
pythonVersion = majorVersion;
version = "${majorVersion}.6"; version = "${majorVersion}.6";
buildInputs = filter (p: p != null) [ buildInputs = filter (p: p != null) [
@ -28,6 +29,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "python3-${version}"; name = "python3-${version}";
pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
src = fetchurl { src = fetchurl {

View file

@ -20,6 +20,7 @@ with stdenv.lib;
let let
majorVersion = "3.4"; majorVersion = "3.4";
pythonVersion = majorVersion;
version = "${majorVersion}.2"; version = "${majorVersion}.2";
fullVersion = "${version}"; fullVersion = "${version}";
@ -29,6 +30,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "python3-${fullVersion}"; name = "python3-${fullVersion}";
pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
src = fetchurl { src = fetchurl {

View file

@ -3,6 +3,8 @@
with pkgs.lib; with pkgs.lib;
let let
pythonAtLeast = versionAtLeast python.pythonVersion;
pythonOlder = versionOlder python.pythonVersion;
isPy26 = python.majorVersion == "2.6"; isPy26 = python.majorVersion == "2.6";
isPy27 = python.majorVersion == "2.7"; isPy27 = python.majorVersion == "2.7";
isPy33 = python.majorVersion == "3.3"; isPy33 = python.majorVersion == "3.3";
@ -2992,11 +2994,14 @@ let
}; };
pew = buildPythonPackage rec { pew = buildPythonPackage rec {
name = "pew-0.1.9"; name = "pew-0.1.14";
namePrefix = "";
disabled = pythonOlder "3.4"; # old versions require backported libraries
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz"; url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz";
md5 = "90a82400074b50a9e73c3045ed9ac217"; md5 = "0a06ab0885b39f1ef3890893942f3225";
}; };
propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ];
@ -3005,6 +3010,7 @@ let
description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite";
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.berdario ];
}; };
}; };
@ -10982,11 +10988,11 @@ let
}; };
virtualenv-clone = buildPythonPackage rec { virtualenv-clone = buildPythonPackage rec {
name = "virtualenv-clone-0.2.4"; name = "virtualenv-clone-0.2.5";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz"; url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz";
md5 = "71168b975eaaa91e65559bcc79290b3b"; md5 = "23e71d255058b2543d839af7f4ce3208";
}; };
buildInputs = with self; [pytest]; buildInputs = with self; [pytest];