From 7f520bdad8d480727e48f6c33ef053f07574b0ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Sep 2016 18:58:14 +0200 Subject: [PATCH] Revert "Python 2.6: add less" This reverts commit 6b11c96c86e907e9c2e107cf54133223c32dc009. --- .../interpreters/python/cpython/2.6/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index e5c33cd7b2b..5311be697af 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, less, includeModules ? false +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage , python26Packages }: @@ -53,8 +53,6 @@ let [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; - propagatedBuildInputs = [ less ]; - mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; LIBRARY_PATH = makeLibraryPath paths; @@ -66,8 +64,8 @@ let name = "python${if includeModules then "" else "-minimal"}-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs propagatedBuildInputs - preConfigure configureFlags; + inherit majorVersion version src patches buildInputs preConfigure + configureFlags; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;