From d6cd9589dc4a56fb46005e6b65559921a4f0fc45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Jul 2024 19:48:26 +0200 Subject: [PATCH] less: 643 -> 661 https://www.greenwoodsoftware.com/less/news.661.html --- pkgs/by-name/le/less/package.nix | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index f94e4b0cad79..da6fa7c3ec11 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , ncurses , pcre2 , withSecure ? false @@ -9,30 +8,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "less"; - version = "643"; + version = "661"; # 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-${finalAttrs.version}.tar.gz"; - hash = "sha256-KRG1QyyDb6CEyKLmj2zWMSNywCalj6qpiGJzHItgUug="; + hash = "sha256-K18BZyFuPvD/ywwxw3Tih+sDXk4iPV2uMVwng7bnOO0="; }; - patches = [ - (fetchpatch { - # https://www.openwall.com/lists/oss-security/2024/04/12/5 - name = "sec-issue-newline-path.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/less/-/raw/1d570db0c84fe95799f460526492e45e24c30ad0/backport-007521ac3c95bc76.patch"; - hash = "sha256-BT8DLIu7oVhL5XL50uFVUp97qjklcvRHy85UQwVKAmc="; - }) - (fetchpatch { - # https://github.com/gwsw/less/pull/416 - name = "freebsd.patch"; - url = "https://github.com/gwsw/less/commit/3ecff3752078fda90fd46c9f020f2a2bb548dd71.patch"; - hash = "sha256-Iv2Jm/7wwRsyLchoEvYz9VziySJ6sI4YbSgFTdQrV+I="; - }) - ]; - buildInputs = [ ncurses pcre2