summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-01 12:20:41 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-01 12:54:46 +0200
commit0c3b1112afe3c9231db2498f913c9b2bcf90a5b4 (patch)
treef925dca52c3308acc068401d48b6cc85e01f8c10
parentb1841490e72bb187571f96a959b7fef9ccd9ebcf (diff)
downloadnixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.tar
nixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.tar.gz
nixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.tar.bz2
nixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.tar.lz
nixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.tar.xz
nixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.tar.zst
nixlib-0c3b1112afe3c9231db2498f913c9b2bcf90a5b4.zip
Revert "Python 3.5: add less"
This reverts commit e261818c687af3fee9caa77b349d6f74a9e6aa93 and
others. Having Python propagate less really doesn't make sense.
-rw-r--r--pkgs/development/interpreters/python/cpython/3.3/default.nix5
-rw-r--r--pkgs/development/interpreters/python/cpython/3.4/default.nix5
-rw-r--r--pkgs/development/interpreters/python/cpython/3.5/default.nix7
-rw-r--r--pkgs/development/interpreters/python/cpython/3.6/default.nix7
4 files changed, 0 insertions, 24 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index 1d2312fdc151..87c99a61c162 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -2,7 +2,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -29,10 +28,6 @@ let
     zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
   ];
 
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${version}";
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 64c61e504b7e..3e8bb6f411da 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -2,7 +2,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -44,10 +43,6 @@ let
     xproto
   ] ++ optionals stdenv.isDarwin [ CF configd ];
 
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index c36d7c2a6eb9..9050679435c6 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -2,7 +2,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -43,11 +42,6 @@ let
     libX11
     xproto
   ] ++ optionals stdenv.isDarwin [ CF configd ];
-
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
@@ -55,7 +49,6 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   inherit buildInputs;
-  inherit propagatedBuildInputs;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 3269a3c9684f..2c1846442070 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -3,7 +3,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -45,11 +44,6 @@ let
     libX11
     xproto
   ] ++ optionals stdenv.isDarwin [ CF configd ];
-
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
@@ -57,7 +51,6 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   inherit buildInputs;
-  inherit propagatedBuildInputs;
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz";