diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-26 15:16:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-26 15:16:33 +0100 |
commit | eb7cfb47938aabceab2d665e62f7556f8ad4db8e (patch) | |
tree | fa60cc330002d3f99973e51d7017a85f5aa82d03 /pkgs | |
parent | bce101b54455c02d12756a7251e93e76d82eeda0 (diff) | |
parent | d735efc882e2d5a5c1f7aee3a726913fd0447f42 (diff) |
Merge pull request #117684 from dotlambda/llfuse-1.4.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/llfuse/default.nix | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index e74263cdb77e..16adf1beabd4 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,42 +1,53 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub , contextlib2 +, cython +, fuse +, pkg-config +, pytestCheckHook +, python +, which }: buildPythonPackage rec { pname = "llfuse"; - version = "1.3.8"; + version = "1.4.1"; - src = fetchPypi { - inherit pname version; - sha256 = "1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr"; - }; + disabled = pythonOlder "3.5"; - patches = [ - # fix tests with pytest 6 - (fetchpatch { - url = "https://github.com/python-llfuse/python-llfuse/commit/1ed8b280d2544eedf8bf209761bef0d2519edd17.diff"; - sha256 = "0wailfrr1i0n2m9ylwpr00jh79s7z3l36w7x19jx1x4djcz2hdps"; - }) - ]; + src = fetchFromGitHub { + owner = "python-llfuse"; + repo = "python-llfuse"; + rev = "release-${version}"; + sha256 = "1dcpdg6cpkmdbyg66fgrylj7dp9zqzg5bf23y6m6673ykgxlv480"; + }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ cython pkg-config ]; buildInputs = [ fuse ]; - checkInputs = [ pytest which ] ++ - lib.optionals stdenv.isLinux [ attr ]; - propagatedBuildInputs = [ contextlib2 ]; - checkPhase = '' - py.test -k "not test_listdir" ${lib.optionalString stdenv.isDarwin ''-m "not uses_fuse"''} + preBuild = '' + ${python.interpreter} setup.py build_cython ''; + checkInputs = [ pytestCheckHook which ]; + + disabledTests = [ + "test_listdir" # accesses /usr/bin + ] ++ lib.optionals stdenv.isDarwin [ + "uses_fuse" + ]; + meta = with lib; { description = "Python bindings for the low-level FUSE API"; homepage = "https://github.com/python-llfuse/python-llfuse"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor dotlambda ]; }; } |