diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 661cf6c0163a..45e7b0ac64a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3984,9 +3984,7 @@ let
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
   flup = builderDefsPackage ../development/python-modules/flup {
-    inherit fetchurl stdenv;
-    python = python25;
-    setuptools = setuptools.passthru.function {python = python25;};
+    inherit fetchurl stdenv python setuptools;
   };
 
   numeric = callPackage ../development/python-modules/numeric { };
@@ -6159,7 +6157,8 @@ let
 
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
-    inherit monotone flup cheetahTemplate highlight ctags
+    inherit 
+      monotone flup cheetahTemplate highlight ctags
       makeWrapper graphviz which python;
   };