From 81a0a3d458b226dabf7b2849f3ee00d4a9a688e5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 27 Jun 2013 00:35:47 +0200 Subject: [PATCH 1/2] python-six: Update to 1.3.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0e74a0277f1..9e15a2f29524 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4546,11 +4546,11 @@ pythonPackages = python.modules // rec { six = buildPythonPackage rec { - name = "six-1.1.0"; + name = "six-1.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; - md5 = "9e8099b57cd27493a6988e9c9b313e23"; + md5 = "ec47fe6070a8a64c802363d2c2b1e2ee"; }; # error: invalid command 'test' From 84a4d03b51037be41b33e9db4b4f4955c1b9c47e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 27 Jun 2013 00:36:28 +0200 Subject: [PATCH 2/2] python-mrbob: fix it and update to 0.1a9 --- pkgs/top-level/python-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e15a2f29524..45afdf766ef6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2541,16 +2541,17 @@ pythonPackages = python.modules // rec { mrbob = buildPythonPackage rec { name = "mrbob-${version}"; - version = "0.1a6"; + version = "0.1a9"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; - md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; + md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a"; }; - buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]); + buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ argparse jinja2 ]; + propagatedBuildInputs = [ argparse jinja2 six python.modules.readline ] ++ + (optionals isPy26 [ importlib ordereddict ]); meta = { homepage = https://github.com/iElectric/mr.bob.git;