From de0264ce1758245a19a56c06c088a9da42fc99e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 24 Jun 2016 19:57:48 +0200 Subject: [PATCH] attic: unbreak "attic mount" by using old llfuse 0.41 llfuse >= 0.42 has breaking changes, causing "attic mount" to fail: TypeError: main() got an unexpected keyword argument 'single' Side note: borgbackup, a fork of attic, has been updated to work with newer llfuse. --- pkgs/tools/backup/attic/default.nix | 2 +- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index a639dbb2fd2..d4e8634039a 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; - [ cython msgpack openssl acl llfuse ]; + [ cython msgpack openssl acl llfuse-0-41 ]; preConfigure = '' export ATTIC_OPENSSL_PREFIX="${openssl.dev}" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 056e9cc54ca..66604ea3b57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12041,6 +12041,30 @@ in modules // { }; }; + # Old version needed for attic (backup program) due to breaking change in + # llfuse >= 0.42. + llfuse-0-41 = buildPythonPackage rec { + name = "llfuse-0.41.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; + }; + buildInputs = with self; [ pytest pkgs.pkgconfig 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 ]; + }; + }; + locustio = buildPythonPackage rec { name = "locustio-0.7.2";