Merge pull request #6369 from mvcisback/funcy3

Allow funcy package to be built under python3 and python2
This commit is contained in:
lethalman 2015-03-12 10:29:10 +01:00
commit 50de6f7acf

View File

@ -13510,6 +13510,7 @@ let
};
};
moreItertools = buildPythonPackage rec {
name = "more-itertools-2.2";
@ -13529,6 +13530,7 @@ let
};
};
uncertainties = buildPythonPackage rec {
name = "uncertainties-2.4.6.1";
@ -13547,6 +13549,23 @@ let
};
funcy = buildPythonPackage rec {
name = "funcy-1.4";
src = pkgs.fetchurl {
url = "https://github.com/Suor/funcy/archive/1.4.tar.gz";
sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7";
};
meta = with stdenv.lib; {
description = "Collection of fancy functional tools focused on practicality.";
homepage = "http://funcy.readthedocs.org/";
license = stdenv.lib.licenses.bsd3;
};
};
# python2.7 specific packages
} // optionalAttrs isPy27 (
with self;
@ -13848,20 +13867,5 @@ let
};
};
funcy = buildPythonPackage rec {
name = "funcy-1.4";
src = pkgs.fetchurl {
url = "https://github.com/Suor/funcy/archive/1.4.tar.gz";
sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7";
};
meta = with stdenv.lib; {
description = "Collection of fancy functional tools focused on practicality.";
homepage = "http://funcy.readthedocs.org/";
license = stdenv.lib.licenses.bsd3;
};
};
}); in pythonPackages