1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00

Merge pull request #681 from offlinehacker/mrbob_fix

python-mrbob: Make it work, update to 0.1a9 and update python-six to 1.3.0
This commit is contained in:
Domen Kožar 2013-06-26 23:57:12 -07:00
commit 43130a432d

View file

@ -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;
@ -4546,11 +4547,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'