git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #162614 from fabaff/fix-devpi-client

devpi-client: add missing input, switch to pytestCheckHook

commitddafcd3f7a01110e0308c984f9437bae2ae17e6b authorFabian Affolter <fabian@affolter-engineering.ch> dateFri 4 Mar 2022, 09:49 (5 years ago) parent2608e2cb543a5e
1 file changed+42−24
pkgs/development/tools/devpi-client/default.nix+42−24
pkgs/development/tools/devpi-client/default.nix+42−24
@@ -1,26 +1,24 @@
11{ lib
2+, argon2-cffi-bindings
23, buildPythonApplication
4+, check-manifest
5+, devpi-common
6+, devpi-server
37, fetchPypi
4−# buildInputs
8+, git
59, glibcLocales
10+, mercurial
11+, mock
612, pkginfo
7−, check-manifest
8−# propagatedBuildInputs
9−, py
10−, devpi-common
1113, pluggy
12−, setuptools
13−# CheckInputs
14−, pytest
14+, py
15+, pytestCheckHook
1516, pytest-flake8
16−, webtest
17−, mock
18−, devpi-server
19−, tox
17+, setuptools
2018, sphinx
19+, tox
20+, webtest
2121, wheel
22−, git
23−, mercurial
2422}:
2523
2624buildPythonApplication rec {
@@ -29,24 +27,45 @@ buildPythonApplication rec {
2927
3028 src = fetchPypi {
3129 inherit pname version;
32− sha256 = "362eb26e95136a792491861cc2728d14a6309a9d4c4f13a7b9c3e6fd39de58ec";
30+ hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw=";
3331 };
3432
35− buildInputs = [ glibcLocales ];
33+ buildInputs = [
34+ glibcLocales
35+ ];
3636
37− propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ];
37+ propagatedBuildInputs = [
38+ argon2-cffi-bindings
39+ check-manifest
40+ devpi-common
41+ pkginfo
42+ pluggy
43+ py
44+ setuptools
45+ ];
3846
3947 checkInputs = [
40− pytest pytest-flake8 webtest mock
41− devpi-server tox
42− sphinx wheel git mercurial
48+ devpi-server
49+ git
50+ mercurial
51+ mock
52+ pytestCheckHook
53+ pytest-flake8
54+ sphinx
55+ tox
56+ webtest
57+ wheel
4358 ];
4459
45− # --fast skips tests which try to start a devpi-server improperly
46− checkPhase = ''
47− HOME=$TMPDIR py.test --fast
60+ preCheck = ''
61+ export HOME=$(mktemp -d);
4862 '';
4963
64+ pytestFlagsArray = [
65+ # --fast skips tests which try to start a devpi-server improperly
66+ "--fast"
67+ ];
68+
5069 LC_ALL = "en_US.UTF-8";
5170
5271 __darwinAllowLocalNetworking = true;
@@ -57,5 +76,4 @@ buildPythonApplication rec {
5776 license = licenses.mit;
5877 maintainers = with maintainers; [ lewo makefu ];
5978 };
60−
6179}