diff options
| author | Domen Kožar <domen@dev.si> | 2014-10-31 12:36:54 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-10-31 12:36:54 +0200 |
| commit | 0433a33816250cff95be36110e5088d7554996ac (patch) | |
| tree | 779770d3a21be6a7ebf857c8ca0b3e82478216c8 /pkgs/top-level | |
| parent | e18e77fbcdebc5bf1768157747b7e6d1ae7d9379 (diff) | |
| parent | c73d0a3bc232a9ae285f5b2ba025771c9a1e2f7c (diff) | |
| download | nixpkgs-0433a33816250cff95be36110e5088d7554996ac.tar nixpkgs-0433a33816250cff95be36110e5088d7554996ac.tar.gz nixpkgs-0433a33816250cff95be36110e5088d7554996ac.tar.bz2 nixpkgs-0433a33816250cff95be36110e5088d7554996ac.tar.lz nixpkgs-0433a33816250cff95be36110e5088d7554996ac.tar.xz nixpkgs-0433a33816250cff95be36110e5088d7554996ac.tar.zst nixpkgs-0433a33816250cff95be36110e5088d7554996ac.zip | |
Merge pull request #4745 from anderspapitto/master
add datadiff and termcolor python packages
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 224e2f632c8..7514243fa9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2641,7 +2641,7 @@ let name = "poppler-qt4-${version}"; version = "0.18.1"; disabled = isPy3k || isPyPy; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" + "python-poppler-qt4-${version}.tar.gz"; @@ -6578,7 +6578,7 @@ let ${python}/bin/${python.executable} setup.py install \ --install-lib=$out/lib/${python.libPrefix}/site-packages \ --prefix="$out" - ''; + ''; meta = with stdenv.lib; { homepage = https://github.com/Groundworkstech/pybfd; @@ -11110,7 +11110,7 @@ let buildInputs = with self; [ nose mock ]; propagatedBuildInputs = with self; [ - jinja2 pyyaml redis requests pagerduty + jinja2 pyyaml redis requests pagerduty python_simple_hipchat pushbullet ]; @@ -11685,4 +11685,37 @@ let maintainers = [ stdenv.lib.maintainers.DamienCassou ]; }; }; + + datadiff = buildPythonPackage rec { + name = "datadiff-1.1.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/datadiff/datadiff-1.1.6.zip"; + md5 = "c34a690db75eead148aa5fa89e575d1e"; + }; + + buildInputs = with self; [ nose ]; + + meta = with stdenv.lib; { + description = "DataDiff"; + homepage = http://sourceforge.net/projects/datadiff/; + license = licenses.asl20; + }; + }; + + termcolor = buildPythonPackage rec { + name = "termcolor-1.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz"; + md5 = "043e89644f8909d462fbbfa511c768df"; + }; + + meta = with stdenv.lib; { + description = "Termcolor"; + homepage = http://pypi.python.org/pypi/termcolor; + license = licenses.mit; + }; + }; + }); in pythonPackages |