public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-03-08 19:20:18 +01:00
parent 6ba8f344c6 042adf08d1
commit 277d488026
374 changed files with 3871 additions and 2493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+11 -1
View File
@@ -250,7 +250,9 @@ in {
aiohomekit = callPackage ../development/python-modules/aiohomekit { };
aiohttp = callPackage ../development/python-modules/aiohttp { };
aiohttp = callPackage ../development/python-modules/aiohttp {
pytestCheckHook = self.pkgsBuildHost.pytestCheckHook.override { pytest = self.pytest_6_1; };
};
aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
@@ -6220,6 +6222,14 @@ in {
hypothesis = self.hypothesis.override { doCheck = false; };
};
pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {
version = "6.1.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
};
});
pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };