summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-10-29 15:57:39 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-10-29 22:35:15 +0100
commitadac3e43fd271dbb9c50cd2f9d42588b5b93e9bb (patch)
treee719cbacbbc3eba18148e37e035c208088b02d87
parent140243639529209db37f7c79c8c44dea1db90542 (diff)
downloadnixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.tar
nixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.tar.gz
nixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.tar.bz2
nixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.tar.lz
nixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.tar.xz
nixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.tar.zst
nixlib-adac3e43fd271dbb9c50cd2f9d42588b5b93e9bb.zip
pythonPackages.llfuse: move to python-modules/
-rw-r--r--pkgs/development/python-modules/llfuse/default.nix32
-rw-r--r--pkgs/top-level/python-packages.nix29
2 files changed, 34 insertions, 27 deletions
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 {