From 68b183e309df1e7c6d47dac62dfe220af9d16fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 12 Oct 2014 18:24:16 +0200
Subject: [PATCH] simplify

---
 pkgs/development/interpreters/python/2.6/default.nix |  2 +-
 pkgs/development/interpreters/python/2.7/default.nix |  2 +-
 pkgs/development/libraries/thrift/default.nix        |  2 +-
 pkgs/top-level/all-packages.nix                      | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index dcbb16f55232..cbdb55f4cc35 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -115,7 +115,7 @@ let
     , internalName ? "_" + moduleName
     , deps
     }:
-    if (includeModules) then null else stdenv.mkDerivation rec {
+    if includeModules then null else stdenv.mkDerivation rec {
       name = "python-${moduleName}-${python.version}";
 
       inherit src patches preConfigure;
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 9c6fd7d75cf5..e5dff81410c7 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -117,7 +117,7 @@ let
     , internalName ? "_" + moduleName
     , deps
     }:
-    if (includeModules) then null else stdenv.mkDerivation rec {
+    if includeModules then null else stdenv.mkDerivation rec {
       name = "python-${moduleName}-${python.version}";
 
       inherit src patches preConfigure;
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index f166e35af1ef..29b0c1a9b291 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   patches = [ ./yylex.patch ];
 
   # Workaround to make the python wrapper not drop this package:
-  # pythonFullWithPkgs.override { extraLibs = [ thrift ]; }
+  # pythonFullBuildEnv.override { extraLibs = [ thrift ]; }
   pythonPath = [];
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c858ce652b5..fc1ed26152da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1875,7 +1875,7 @@ let
   openobex = callPackage ../tools/bluetooth/openobex { };
 
   openopc = callPackage ../tools/misc/openopc {
-    pythonFull = python27FullWithPkgs.override {
+    pythonFull = python27FullBuildEnv.override {
       extraLibs = [ python27Packages.pyro3 ];
     };
   };
@@ -3947,16 +3947,16 @@ let
   python27Full = python27.override {
     includeModules = true;
   };
-  python26FullWithPkgs = callPackage ../development/interpreters/python/wrapper.nix {
+  python26FullBuildEnv = callPackage ../development/interpreters/python/wrapper.nix {
     python = python26Full;
     inherit (python26Packages) recursivePthLoader;
   };
-  python27FullWithPkgs = callPackage ../development/interpreters/python/wrapper.nix {
+  python27FullBuildEnv = callPackage ../development/interpreters/python/wrapper.nix {
     python = python27Full;
     inherit (python27Packages) recursivePthLoader;
   };
-  pythonFullWithPkgs = python2FullWithPkgs;
-  python2FullWithPkgs = python27FullWithPkgs;
+  pythonFullBuildEnv = python2FullBuildEnv;
+  python2FullBuildEnv = python27FullBuildEnv;
 
   python2nix = callPackage ../tools/package-management/python2nix { };