From e75096142cf2f55a22c599469a2de0ef9f0e58b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 May 2017 08:50:14 +0200 Subject: [PATCH] pythonPackages.llfuse-0-41: move into attic because that's the only expression using this older version. --- pkgs/tools/backup/attic/default.nix | 30 +++++++++++++++++++++++++++-- pkgs/top-level/python-packages.nix | 24 ----------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index d4e8634039a9..abfccb97641c 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -1,6 +1,32 @@ -{ stdenv, fetchzip, python3Packages, openssl, acl }: +{ stdenv, fetchzip, python3Packages, openssl, acl, fetchurl, pkgconfig, fuse, attr, which }: -python3Packages.buildPythonApplication rec { +let + + # Old version needed for attic (backup program) due to breaking change in + # llfuse >= 0.42. + llfuse-0-41 = python3Packages.buildPythonPackage rec { + name = "llfuse-0.41.1"; + src = fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; + }; + buildInputs = with python3Packages; [ pytest pkgconfig fuse attr which ]; + propagatedBuildInputs = with python3Packages; [ 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 = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + }; + }; + +in python3Packages.buildPythonApplication rec { name = "attic-${version}"; version = "0.16"; namePrefix = ""; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ffd5ef81fb6..ff180cc25ef4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13600,30 +13600,6 @@ in { }; }; - # 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";