diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 20:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 22:00:10 +0200 |
commit | 40785f0dac55be9bffa029498d20539e567822be (patch) | |
tree | c126c0271b8644830e16cd0c1a5d906d520fed65 /pkgs/top-level/python-packages.nix | |
parent | ba2eec97b5022848fffeb8c85303b7afe4690e82 (diff) | |
parent | 9aa3e78ab206556754186cc2b88aea5009af0f7c (diff) | |
download | nixlib-40785f0dac55be9bffa029498d20539e567822be.tar nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.gz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.bz2 nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.lz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.xz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.zst nixlib-40785f0dac55be9bffa029498d20539e567822be.zip |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 107 |
1 files changed, 103 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f14dbfaea479..08014b2de30d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1359,13 +1359,13 @@ in modules // { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.10.38"; + version = "1.10.46"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "01d14snp3h4dkbwyviyprhcl8qcngc6nyzwy3k3nxvm1ia9hvz2n"; + sha256 = "1d2xjhdmjna9zxa4ybk7cjypib5yq2gd3w5fgpb4lfs6bh3mr554"; }; # No tests included @@ -2746,12 +2746,12 @@ in modules // { }; botocore = buildPythonPackage rec { - version = "1.4.28"; # This version is required by awscli + version = "1.4.36"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "1qfvcb7japa3y1j4b86af9ph8q8mbq2mrx6xfhlqcf2x399l2phl"; + sha256 = "0mkydnbbn0x97nfzwqia68zw2y5j7i9yzpq5kasvc80n2z999h39"; }; propagatedBuildInputs = @@ -6100,6 +6100,45 @@ in modules // { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); + Flootty = buildPythonPackage rec { + name = "Flootty-3.2.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/F/Flootty/${name}.tar.gz"; + sha256 = "14n2q2k388xbmp5rda5ss879bg5cbibk4zzz7c8mrjsmxhgagmmg"; + }; + + meta = with pkgs.stdenv.lib; { + description = "Floobits collaborative terminal"; + homepage = "https://github.com/Floobits/flootty/"; + maintainers = with maintainers; [ garbas ]; + license = licenses.asl20; + }; + }; + + flowlogs_reader = buildPythonPackage rec { + name = "flowlogs_reader-1.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/f/flowlogs_reader/${name}.tar.gz"; + sha256 = "0158aki6m3pkf98hpd60088qyhrfxkmybdf8hv3qfl8nb61vaiwf"; + }; + + propagatedBuildInputs = with self; [ + botocore boto3 docutils + ]; + buildInputs = with self; [ + unittest2 mock + ]; + + meta = with pkgs.stdenv.lib; { + description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; + homepage = "https://github.com/obsrvbl/flowlogs-reader"; + maintainers = with maintainers; [ cransom ]; + license = licenses.asl20; + }; + }; + frozendict = buildPythonPackage rec { name = "frozendict-0.5"; @@ -9520,6 +9559,22 @@ in modules // { }; }; + exifread = buildPythonPackage rec { + name = "ExifRead-2.1.2"; + + meta = { + description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files"; + homepage = "https://github.com/ianare/exif-py"; + license = "BSD"; + maintainers = with maintainers; [ vozz ]; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/E/ExifRead/${name}.tar.gz"; + sha256 = "1b90jf6m9vxh9nanhpyvqdq7hmfx5iggw1l8kq10jrs6xgr49qkr"; + }; + }; + fastimport = buildPythonPackage rec { name = "fastimport-${version}"; version = "0.9.4"; @@ -11253,6 +11308,21 @@ in modules // { }; }; + inifile = buildPythonPackage rec { + name = "inifile-0.3"; + + meta = { + description = "A small INI library for Python"; + homepage = "https://github.com/mitsuhiko/python-inifile"; + license = "BSD"; + maintainers = with maintainers; [ vozz ]; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/i/inifile/${name}.tar.gz"; + sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; + }; + }; interruptingcow = buildPythonPackage rec { name = "interruptingcow-${version}"; @@ -11988,6 +12058,34 @@ in modules // { }; }; + lektor = buildPythonPackage rec { + name = "lektor-${version}"; + + version = "2.3"; + + src = pkgs.fetchgit { + url = "https://github.com/lektor/lektor"; + rev = "refs/tags/${version}"; + sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; + }; + + LC_ALL="en_US.UTF-8"; + + meta = { + description = "A static content management system"; + homepage = "https://www.getlektor.com/"; + license = "BSD"; + maintainers = with maintainers; [ vozz ]; + }; + + # No tests included in archive + doCheck = false; + + propagatedBuildInputs = with self; [ + click watchdog exifread requests2 mistune inifile Babel jinja2 + flask pyopenssl ndg-httpsclient pkgs.glibcLocales + ]; + }; libcloud = buildPythonPackage (rec { name = "libcloud-0.18.0"; @@ -28382,4 +28480,5 @@ in modules // { }; buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.mesa pkgs.xorg.libXi ]; }; + } |