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

Merge pull request #111619 from fabaff/bump-watchdog

Browse Source
This commit is contained in:
Sandro 2021-02-02 13:30:08 +01:00 committed by GitHub
commit 7868152ea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkgs/development/python-modules/coconut/default.nix
View File

@ -1,17 +1,15 @@
{ { lib
lib, , buildPythonApplication
buildPythonApplication, , fetchFromGitHub
fetchFromGitHub, , fetchpatch
fetchpatch, , cpyparsing
, ipykernel
cpyparsing, , mypy
ipykernel, , pygments
mypy, , pytestCheckHook
pygments, , prompt_toolkit
pytest, , tkinter
prompt_toolkit, , watchdog
tkinter,
watchdog
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -33,15 +31,26 @@ buildPythonApplication rec {
url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch"; url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q"; sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
}) })
(fetchpatch {
name = "support-python-3.9.patch";
url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch";
sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71";
})
];
checkInputs = [
pytestCheckHook
tkinter
]; ];
checkInputs = [ pytest tkinter ];
# Currently most tests do not work on Hydra due to external fetches. # Currently most tests do not work on Hydra due to external fetches.
checkPhase = '' pytestFlagsArray = [
pytest tests/constants_test.py "tests/constants_test.py"
pytest tests/main_test.py::TestShell::test_compile_to_file "tests/main_test.py::TestShell::test_compile_to_file"
pytest tests/main_test.py::TestShell::test_convenience "tests/main_test.py::TestShell::test_convenience"
''; ];
pythonImportsCheck = [ "coconut" ];
meta = with lib; { meta = with lib; {
homepage = "http://coconut-lang.org/"; homepage = "http://coconut-lang.org/";

20
pkgs/development/python-modules/watchdog/default.nix
View File

@ -5,22 +5,34 @@
, pathtools , pathtools
, pyyaml , pyyaml
, pkgs , pkgs
, pytest-cov
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "watchdog"; pname = "watchdog";
version = "0.10.4"; version = "1.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43"; sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI=";
}; };
buildInputs = lib.optionals stdenv.isDarwin buildInputs = lib.optionals stdenv.isDarwin
[ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; [ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
propagatedBuildInputs = [ argh pathtools pyyaml ];
doCheck = false; propagatedBuildInputs = [
argh
pathtools
pyyaml
];
checkInputs = [
pytest-cov
pytestCheckHook
];
pythonImportsCheck = [ "watchdog" ];
meta = with lib; { meta = with lib; {
description = "Python API and shell utilities to monitor file system events"; description = "Python API and shell utilities to monitor file system events";