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: 087b87758e3b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cf9c7163fc1
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 15, 2019

  1. pythonPackages.aiohttp-cors: move expression

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    eda6360 View commit details

  2. pythonPackages.aiohttp: disable tests

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    3cf9c71 View commit details
0 ...velopment/python-modules/aiohttp/cors.nix → ...t/python-modules/aiohttp-cors/default.nix
View file
File renamed without changes.
8 changes: 8 additions & 0 deletions pkgs/development/python-modules/aiohttp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];

# Don't error on cryptography deprecation warning
postPatch = ''
substituteInPlace pytest.ini --replace "filterwarnings = error" ""
'';

# coroutine 'noop2' was never awaited
doCheck = false;

meta = with lib; {
description = "Asynchronous HTTP Client/Server for Python and asyncio";
license = licenses.asl20;
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1028,7 +1028,7 @@ in {

aiohttp = callPackage ../development/python-modules/aiohttp { };

aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { };
aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };

aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };