diff options
author | rnhmjoj <micheleguerinirocco@me.com> | 2017-06-01 22:22:24 +0200 |
---|---|---|
committer | rnhmjoj <micheleguerinirocco@me.com> | 2017-06-02 11:57:45 +0200 |
commit | 28cbb4ae6a10a44b40883479608b178d0be9c16c (patch) | |
tree | e43c27f4f3de0bfe3ea7c55852c1cd5df4605f58 /pkgs/top-level | |
parent | 0cbcb95e1437ecd92592094aeb3f4fc516780c2a (diff) | |
download | nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.tar nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.tar.gz nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.tar.bz2 nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.tar.lz nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.tar.xz nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.tar.zst nixlib-28cbb4ae6a10a44b40883479608b178d0be9c16c.zip |
pythonPackages.colorama: move to development/python-modules
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 60 |
1 files changed, 22 insertions, 38 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c146ea70b2c6..c8b147a399e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1519,13 +1519,26 @@ in { }; }; - awscli = buildPythonPackage rec { - name = "awscli-${version}"; - version = "1.11.75"; - namePrefix = ""; - src = pkgs.fetchurl { - url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0bkjyrgb78f29vvr8j2id0386d30w340wrl7krwiha725c9y3pz1"; + awscli = + let + colorama_3_7 = self.colorama.overrideAttrs (old: rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.7"; + src = fetchPypi { + inherit pname version; + sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; + }; + }); + in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "awscli"; + version = "1.11.95"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "1f99cg5x5kw1p1awny64adp07rvva57srdfrbi81yl2kpw33ybjc"; }; # No tests included @@ -1536,7 +1549,7 @@ in { bcdoc s3transfer six - colorama_3_3 + colorama_3_7 docutils rsa pyyaml @@ -3846,36 +3859,7 @@ in { }; }; - - colorama = buildPythonPackage rec { - name = "colorama-${version}"; - version = "0.3.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = https://github.com/tartley/colorama; - license = "bsd"; - description = "Cross-platform colored terminal text"; - }; - }; - - # Needed for awscli - colorama_3_3 = self.colorama.override rec { - name = "colorama-${version}"; - version = "0.3.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c"; - }; - }; - + colorama = callPackage ../development/python-modules/colorama { }; CommonMark = buildPythonPackage rec { name = "CommonMark-${version}"; |