Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 76723a26f9e9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2f39f97d061
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 16, 2018

  1. python3Packages.aiohttp: 2.3.10 -> 3.0.1

    Robert Schütz committed Feb 16, 2018
    Copy the full SHA
    b431193 View commit details

  2. Merge pull request #34891 from dotlambda/aiohttp 

    python3Packages.aiohttp: 2.3.10 -> 3.0.1
    @primeos
    primeos authored Feb 16, 2018
    Copy the full SHA
    b2f39f9 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/development/python-modules/aiohttp/default.nix
9 changes: 5 additions & 4 deletions pkgs/development/python-modules/aiohttp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, attrs
, chardet
, multidict
, async-timeout
@@ -14,24 +15,24 @@

buildPythonPackage rec {
pname = "aiohttp";
version = "2.3.10";
version = "3.0.1";

src = fetchPypi {
inherit pname version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221";
};

disabled = pythonOlder "3.4";

checkInputs = [ pytest gunicorn pytest-mock ];

propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
++ lib.optional (pythonOlder "3.7") idna-ssl;

meta = with lib; {
description = "Asynchronous HTTP Client/Server for Python and asyncio";
license = licenses.asl20;
homepage = https://github.com/KeepSafe/aiohttp/;
homepage = https://github.com/aio-libs/aiohttp;
maintainers = with maintainers; [ dotlambda ];
};
}