diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-14 21:50:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-14 21:50:32 +0200 |
commit | 27eb3c267394f4047a4c3f16e6da9a19fe0f9ff2 (patch) | |
tree | 84a2f11751661ee0d316ada01662546a765ad4a6 /pkgs/top-level/python-packages.nix | |
parent | 1c88d0c6bd0d632d58dd715dcf97a10618f0ac43 (diff) | |
parent | 65b15ba6a96760125cc3984893f587af1ffacaac (diff) |
Merge pull request #41934 from teto/cmd2_0.9.1
pythonPackages.cmd2: 0.8.0 -> 0.9.1
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5eb33fa96d96..add15eaae888 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9110,7 +9110,9 @@ in { cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; cachetools = callPackage ../development/python-modules/cachetools {}; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; + cmd2_9 = callPackage ../development/python-modules/cmd2 {}; + cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; warlock = buildPythonPackage rec { name = "warlock-${version}"; @@ -14735,30 +14737,7 @@ EOF imagemagick = pkgs.imagemagickBig; }; - wcwidth = buildPythonPackage rec { - name = "wcwidth-${version}"; - version = "0.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; - sha256 = "02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw"; - }; - - # Checks fail due to missing tox.ini file: - doCheck = false; - - meta = { - description = "Measures number of Terminal column cells of wide-character codes"; - longDescription = '' - This API is mainly for Terminal Emulator implementors -- any Python - program that attempts to determine the printable width of a string on - a Terminal. It is implemented in python (no C library calls) and has - no 3rd-party dependencies. - ''; - homepage = https://github.com/jquast/wcwidth; - license = licenses.mit; - }; - }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; web = buildPythonPackage rec { version = "0.37"; |