Merge pull request #6369 from mvcisback/funcy3

Allow funcy package to be built under python3 and python2

lethalman 50de6f7a ce0a5ab6

+19 -15
+19 -15
pkgs/top-level/python-packages.nix
··· 13510 }; 13511 }; 13512 13513 moreItertools = buildPythonPackage rec { 13514 name = "more-itertools-2.2"; 13515 ··· 13529 }; 13530 }; 13531 13532 uncertainties = buildPythonPackage rec { 13533 name = "uncertainties-2.4.6.1"; 13534 ··· 13543 homepage = "http://pythonhosted.org/uncertainties/"; 13544 description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; 13545 license = licenses.bsd3; 13546 }; 13547 }; 13548 ··· 13845 homepage = "https://github.com/erikrose/parsimonious"; 13846 description = "Fast arbitrary-lookahead packrat parser written in pure Python."; 13847 license = licenses.mit; 13848 - }; 13849 - }; 13850 - 13851 - funcy = buildPythonPackage rec { 13852 - name = "funcy-1.4"; 13853 - 13854 - src = pkgs.fetchurl { 13855 - url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; 13856 - sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; 13857 - }; 13858 - 13859 - meta = with stdenv.lib; { 13860 - description = "Collection of fancy functional tools focused on practicality."; 13861 - homepage = "http://funcy.readthedocs.org/"; 13862 - license = stdenv.lib.licenses.bsd3; 13863 }; 13864 }; 13865
··· 13510 }; 13511 }; 13512 13513 + 13514 moreItertools = buildPythonPackage rec { 13515 name = "more-itertools-2.2"; 13516 ··· 13530 }; 13531 }; 13532 13533 + 13534 uncertainties = buildPythonPackage rec { 13535 name = "uncertainties-2.4.6.1"; 13536 ··· 13545 homepage = "http://pythonhosted.org/uncertainties/"; 13546 description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; 13547 license = licenses.bsd3; 13548 + }; 13549 + }; 13550 + 13551 + 13552 + funcy = buildPythonPackage rec { 13553 + name = "funcy-1.4"; 13554 + 13555 + src = pkgs.fetchurl { 13556 + url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; 13557 + sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; 13558 + }; 13559 + 13560 + meta = with stdenv.lib; { 13561 + description = "Collection of fancy functional tools focused on practicality."; 13562 + homepage = "http://funcy.readthedocs.org/"; 13563 + license = stdenv.lib.licenses.bsd3; 13564 + 13565 }; 13566 }; 13567 ··· 13864 homepage = "https://github.com/erikrose/parsimonious"; 13865 description = "Fast arbitrary-lookahead packrat parser written in pure Python."; 13866 license = licenses.mit; 13867 }; 13868 }; 13869