From bf3d901aad6c5d02766756d89cd3436d995486da Mon Sep 17 00:00:00 2001 From: Marcell Vazquez-Chanlatte Date: Mon, 16 Feb 2015 13:17:38 -0600 Subject: [PATCH] allow funcy package to be built under python3 and python2 --- pkgs/top-level/python-packages.nix | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9eb9078f62a..9e633ed27f24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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