From adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 15:57:39 +0100 Subject: [PATCH] pythonPackages.llfuse: move to python-modules/ --- .../python-modules/llfuse/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 ++--------------- 2 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/llfuse/default.nix diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix new file mode 100644 index 000000000000..7c907d1e5ef3 --- /dev/null +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +, contextlib2 +}: + +buildPythonPackage rec { + name = "llfuse-1.0"; + + src = fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pytest fuse attr which ]; + + propagatedBuildInputs = [ contextlib2 ]; + + checkPhase = '' + py.test + ''; + + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for the low-level FUSE API"; + homepage = https://code.google.com/p/python-llfuse/; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb03a13f6e08..d83ac0df11b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10938,33 +10938,8 @@ in { livereload = callPackage ../development/python-modules/livereload { }; - llfuse = buildPythonPackage rec { - name = "llfuse-1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ]; - - propagatedBuildInputs = with self; [ contextlib2 ]; - - checkPhase = '' - py.test - ''; - - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - - meta = { - description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; + llfuse = callPackage ../development/python-modules/llfuse { + fuse = pkgs.fuse; # use "real" fuse, not the python module }; locustio = buildPythonPackage rec {