Revert "Python 3.5: add less"
This reverts commit e261818c68
and
others. Having Python propagate less really doesn't make sense.
This commit is contained in:
parent
b1841490e7
commit
0c3b1112af
|
@ -2,7 +2,6 @@
|
||||||
, bzip2
|
, bzip2
|
||||||
, db
|
, db
|
||||||
, gdbm
|
, gdbm
|
||||||
, less
|
|
||||||
, libX11, xproto
|
, libX11, xproto
|
||||||
, lzma
|
, lzma
|
||||||
, ncurses
|
, ncurses
|
||||||
|
@ -29,10 +28,6 @@ let
|
||||||
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
less
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "python3-${version}";
|
name = "python3-${version}";
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, bzip2
|
, bzip2
|
||||||
, db
|
, db
|
||||||
, gdbm
|
, gdbm
|
||||||
, less
|
|
||||||
, libX11, xproto
|
, libX11, xproto
|
||||||
, lzma
|
, lzma
|
||||||
, ncurses
|
, ncurses
|
||||||
|
@ -44,10 +43,6 @@ let
|
||||||
xproto
|
xproto
|
||||||
] ++ optionals stdenv.isDarwin [ CF configd ];
|
] ++ optionals stdenv.isDarwin [ CF configd ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
less
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "python3-${fullVersion}";
|
name = "python3-${fullVersion}";
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, bzip2
|
, bzip2
|
||||||
, db
|
, db
|
||||||
, gdbm
|
, gdbm
|
||||||
, less
|
|
||||||
, libX11, xproto
|
, libX11, xproto
|
||||||
, lzma
|
, lzma
|
||||||
, ncurses
|
, ncurses
|
||||||
|
@ -43,11 +42,6 @@ let
|
||||||
libX11
|
libX11
|
||||||
xproto
|
xproto
|
||||||
] ++ optionals stdenv.isDarwin [ CF configd ];
|
] ++ optionals stdenv.isDarwin [ CF configd ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
less
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "python3-${fullVersion}";
|
name = "python3-${fullVersion}";
|
||||||
|
@ -55,7 +49,6 @@ stdenv.mkDerivation {
|
||||||
inherit majorVersion version;
|
inherit majorVersion version;
|
||||||
|
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
inherit propagatedBuildInputs;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
|
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
, bzip2
|
, bzip2
|
||||||
, db
|
, db
|
||||||
, gdbm
|
, gdbm
|
||||||
, less
|
|
||||||
, libX11, xproto
|
, libX11, xproto
|
||||||
, lzma
|
, lzma
|
||||||
, ncurses
|
, ncurses
|
||||||
|
@ -45,11 +44,6 @@ let
|
||||||
libX11
|
libX11
|
||||||
xproto
|
xproto
|
||||||
] ++ optionals stdenv.isDarwin [ CF configd ];
|
] ++ optionals stdenv.isDarwin [ CF configd ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
less
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "python3-${fullVersion}";
|
name = "python3-${fullVersion}";
|
||||||
|
@ -57,7 +51,6 @@ stdenv.mkDerivation {
|
||||||
inherit majorVersion version;
|
inherit majorVersion version;
|
||||||
|
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
inherit propagatedBuildInputs;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz";
|
url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz";
|
||||||
|
|
Loading…
Reference in New Issue