diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index cbf7e84c7203..497e1e279ebe 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.4.1"; + version = "1.4.2"; disabled = pythonOlder "3.5"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "python-llfuse"; repo = "python-llfuse"; rev = "release-${version}"; - sha256 = "1dcpdg6cpkmdbyg66fgrylj7dp9zqzg5bf23y6m6673ykgxlv480"; + hash = "sha256-TnZnv439fLvg0WM96yx0dPSSz8Mrae6GDC9LiLFrgQ8="; }; nativeBuildInputs = [ cython pkg-config ]; diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index cb10f07f22aa..bdb420313ba2 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -1,22 +1,45 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which, pythonAtLeast }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cython +, pkg-config +, fuse3 +, trio +, python +, pytestCheckHook +, pytest-trio +, which +}: buildPythonPackage rec { pname = "pyfuse3"; version = "3.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33"; + disabled = pythonOlder "3.5"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "libfuse"; + repo = "pyfuse3"; + rev = "release-${version}"; + hash = "sha256-JGbp2bSI/Rvyys1xMd2o34KlqqBsV6B9LhuuNopayYA="; }; - disabled = pythonAtLeast "3.10"; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cython + pkg-config + ]; buildInputs = [ fuse3 ]; propagatedBuildInputs = [ trio ]; + preBuild = '' + ${python.pythonForBuild.interpreter} setup.py build_cython + ''; + checkInputs = [ pytestCheckHook pytest-trio @@ -27,10 +50,15 @@ buildPythonPackage rec { # Checks if a /usr/bin directory exists, can't work on NixOS disabledTests = [ "test_listdir" ]; + pythonImportsCheck = [ + "pyfuse3" + "pyfuse3_asyncio" + ]; + meta = with lib; { description = "Python 3 bindings for libfuse 3 with async I/O support"; homepage = "https://github.com/libfuse/pyfuse3"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ nyanloutre ]; + maintainers = with maintainers; [ nyanloutre dotlambda ]; }; } diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 8202786dde84..bd04efc92dac 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { ''; nativeBuildInputs = with python3.pkgs; [ + cython setuptools-scm # For building documentation: sphinx @@ -43,12 +44,9 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - cython - llfuse msgpack packaging - ] ++ lib.optionals (!stdenv.isDarwin) [ - pyfuse3 + (if stdenv.isLinux then pyfuse3 else llfuse) ]; preConfigure = ''