7 Commits

Author	SHA1	Message	Date
Robert Schütz	4b5b1370a7	pythonPackages.pytest-mock: remove superfluous patch	2018-03-14 17:33:39 +01:00
Jan Malakhovski	7079e744d4	Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix	2018-03-10 20:38:13 +00:00
makefu	579216f4c4	pythonPackages.pytest-mock: 1.7.0 -> 1.7.1 ... 1.7.0 fails with ascii error	2018-03-05 09:22:41 +01:00
Vladimír Čunát	f5ce8f86df	Revert "Merge staging at '8d490ca9934d0' into master" ... This reverts commit fc23242220, reversing changes made to 754816b84b. We don't have many binaries yet. Comment on the original merge commit.	2018-02-26 22:53:18 +01:00
Robert Schütz	1977a2d5ee	pythonPackages.pytest-mock: fix build ... This applies the following patch: https://github.com/pytest-dev/pytest-mock/pull/107	2018-02-22 01:46:11 +01:00
Frederik Rietdijk	21723f7ebf	python: pytest-mock: 1.6.3 -> 1.7.0	2018-02-18 20:07:43 +01:00
Robert Schütz	804bf3c22a	pythonPackages.pytest-mock: 1.6.0 -> 1.6.3	2018-02-12 12:46:21 +01:00