From de9fb389f402db29c7595997a331acc546795c8e Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Fri, 14 Sep 2018 18:47:18 +0100 Subject: [PATCH] pythonPackages.fuse: 0.2.1 -> 0.3.1 | refactor | python3 support --- .../python-modules/fuse-python/default.nix | 25 +++++++++++++++++ .../python-modules/python-fuse/default.nix | 27 ------------------- pkgs/top-level/python-packages.nix | 4 +-- 3 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/fuse-python/default.nix delete mode 100644 pkgs/development/python-modules/python-fuse/default.nix diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix new file mode 100644 index 000000000000..cf965dd244fc --- /dev/null +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }: + +buildPythonPackage rec { + pname = "fuse-python"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0p1f01gah1y8skirrwsbxapz3g6drqihnkjh27b45ifg43h45g7x"; + }; + + buildInputs = [ fuse ]; + nativeBuildInputs = [ pkgconfig ]; + + # no tests in the Pypi archive + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for FUSE"; + homepage = https://github.com/libfuse/python-fuse; + license = licenses.lgpl21; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix deleted file mode 100644 index 02b86b3b33a3..000000000000 --- a/pkgs/development/python-modules/python-fuse/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, pkgconfig -, fetchurl -, fuse -, buildPythonPackage -, isPy3k -}: - -buildPythonPackage rec { - pname = "fuse"; - version = "0.2.1"; - - disabled = isPy3k; - - src = fetchurl { - url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; - sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; - - meta = { - description = "Python bindings for FUSE"; - license = lib.licenses.lgpl21; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03e2dffe7274..59324f7ab2f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -302,6 +302,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; }; + genanki = callPackage ../development/python-modules/genanki { }; globus-sdk = callPackage ../development/python-modules/globus-sdk { }; @@ -5609,8 +5611,6 @@ in { }; }; - fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; }; - fusepy = buildPythonPackage rec { name = "fusepy-2.0.4";