From 473e5a425198123eacb013840f2c8e011b4de1d5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 30 May 2016 23:20:44 +0200 Subject: [PATCH 1/2] less: 481 -> 483 --- pkgs/tools/misc/less/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 75e00635320..5f7eeba6c55 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-481"; + name = "less-483"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz"; + sha256 = "07z43kwbmba2wh3q1gps09l72p8izfagygmqq1izi50s2h51mfvy"; }; # Look for ‘sysless’ in /etc. From 1ce9da0aa9d26eeb6ac342aeb684484f82e5534a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 31 May 2016 17:38:31 +0100 Subject: [PATCH 2/2] less: support --with-secure --- pkgs/tools/misc/less/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 5f7eeba6c55..910b4963f01 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { name = "less-483"; @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07z43kwbmba2wh3q1gps09l72p8izfagygmqq1izi50s2h51mfvy"; }; - # Look for ‘sysless’ in /etc. - configureFlags = "--sysconfdir=/etc"; - - preConfigure = "chmod +x ./configure"; + configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. + ++ stdenv.lib.optional lessSecure [ "--with-secure" ]; buildInputs = [ ncurses ];