3 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 07bfec41f477..a5df46b6ba4c 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,6 +1,6 @@
 { stdenv, ensureNewerSourcesHook, autoconf, automake, makeWrapper, pkgconfig
 , libtool, which, git
-, boost, python, pythonPackages, libxml2, zlib
+, boost, python2Packages, libxml2, zlib
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@@ -30,6 +30,7 @@ assert cryptopp != null || (nss != null && nspr != null);
 with stdenv;
 with stdenv.lib;
 let
+  inherit (python2Packages) python;
   mkFlag = trueStr: falseStr: cond: name: val:
     if cond == null then null else
       "--${if cond != false then trueStr else falseStr}${name}"
@@ -99,8 +100,7 @@ let
   };
 
   wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
-    + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
-    + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
+    + " --prefix PYTHONPATH : \"$(toPythonPath ${python2Packages.flask})\""
     + " --set PATH \"$out/bin\"";
 in
 stdenv.mkDerivation {
@@ -117,12 +117,12 @@ stdenv.mkDerivation {
     (ensureNewerSourcesHook { year = "1980"; })
   ]
     ++ optionals (versionAtLeast version "9.0.2") [
-      pythonPackages.setuptools pythonPackages.argparse
+      python2Packages.setuptools python2Packages.argparse
     ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
+    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc python2Packages.flask zlib
   ] ++ optionals (versionAtLeast version "9.0.0") [
-    pythonPackages.sphinx # Used for docs
+    python2Packages.sphinx # Used for docs
   ] ++ optionals stdenv.isLinux [
     linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
   ] ++ optionals hasServer [
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index 31c4ceccbc09..bb652c285809 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, python2Packages }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "gitfs-0.2.5";
 
   src = fetchFromGitHub {
@@ -15,7 +15,12 @@ pythonPackages.buildPythonApplication rec {
     echo > requirements.txt
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ atomiclong fusepy pygit2 ];
+  buildInputs = with python2Packages; [ pytest pytestcov mock ];
+  propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ];
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = {
     description = "A FUSE filesystem that fully integrates with git";
@@ -29,4 +34,4 @@ pythonPackages.buildPythonApplication rec {
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.robbinch ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index e97f246e70b9..32c87667ee36 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
+{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
  , liburcu, attr
 }:
@@ -13,7 +13,7 @@ let
     sha256="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap";
   };
   buildInputs = [
-    fuse bison flex_2_5_35 openssl python ncurses readline
+    fuse bison flex_2_5_35 openssl python2 ncurses readline
     autoconf automake libtool pkgconfig zlib libaio libxml2
     acl sqlite liburcu attr
   ];