about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-06-24 19:57:48 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-06-24 20:16:41 +0200
commitde0264ce1758245a19a56c06c088a9da42fc99e2 (patch)
tree4039cec648ec5c3b1d0a950b0b9a5ffa4a600d8c /pkgs
parentc88b4060e066aee05a03413a4e9ec2702ebad00d (diff)
downloadnixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.tar
nixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.tar.gz
nixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.tar.bz2
nixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.tar.lz
nixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.tar.xz
nixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.tar.zst
nixlib-de0264ce1758245a19a56c06c088a9da42fc99e2.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/backup/attic/default.nix2
-rw-r--r--pkgs/top-level/python-packages.nix24
2 files changed, 25 insertions, 1 deletions
diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
index a639dbb2fd29..d4e8634039a9 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 056e9cc54ca0..66604ea3b570 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";