From 3b3e38b4d1a76fc80ca64f878d2ed31101b0fa46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Feb 2023 01:56:11 +0100 Subject: [PATCH] less: Build with pcre2 regex engine and reformat Add a notice about their versioning/release policy. --- pkgs/tools/misc/less/default.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index ebb15a3fd98b..19f4c455965f 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,12 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, lessSecure ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, ncurses +, pcre2 +}: stdenv.mkDerivation rec { pname = "less"; version = "608"; + # Only tarballs on the website are valid releases, + # other versions, e.g. git tags are considered snapshots. src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; - sha256 = "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6"; + hash = "sha256-ppq+LgoSZ3fgIdO3OqMiLhsmHxDmRiTUHsB5aFpqwgk="; }; patches = [ @@ -18,10 +26,16 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. - ++ lib.optionals lessSecure [ "--with-secure" ]; + configureFlags = [ + # Look for ‘sysless’ in /etc. + "--sysconfdir=/etc" + "--with-regex=pcre2" + ]; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + pcre2 + ]; meta = with lib; { homepage = "https://www.greenwoodsoftware.com/less/";