[Backport release-24.11] lesspipe: 2.14 -> 2.17 (#373001)

NixOS · Jan 12, 2025 · 281bd5a · 281bd5a
2 parents cb64f65 + 88c94ff
commit 281bd5a
Showing 1 changed file with 79 additions and 84 deletions.
diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lesspipe";
-  version = "2.14";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "wofr06";
     repo = "lesspipe";
     rev = "v${version}";
-    hash = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=";
+    hash = "sha256-afJuTByGUMU6kFqGGa3pbPaFVdYGcJYiR0RfDNYNgDk=";
   };
 
   nativeBuildInputs = [
@@ -85,89 +85,84 @@ stdenv.mkDerivation rec {
       ];
       fake = {
         # script guards usage behind has_cmd test function, it's safe to leave these external and optional
-        external =
-          [
-            "cpio"
-            "isoinfo"
-            "cabextract"
-            "bsdtar"
-            "rpm2cpio"
-            "bsdtar"
-            "unzip"
-            "ar"
-            "unrar"
-            "rar"
-            "7zr"
-            "7za"
-            "isoinfo"
-            "gzip"
-            "bzip2"
-            "lzip"
-            "lzma"
-            "xz"
-            "brotli"
-            "compress"
-            "zstd"
-            "lz4"
-            "archive_color"
-            "bat"
-            "batcat"
-            "pygmentize"
-            "source-highlight"
-            "vimcolor"
-            "code2color"
+        external = [
+          "cpio"
+          "isoinfo"
+          "cabextract"
+          "bsdtar"
+          "rpm2cpio"
+          "bsdtar"
+          "unzip"
+          "ar"
+          "unrar"
+          "rar"
+          "7zr"
+          "7za"
+          "isoinfo"
+          "gzip"
+          "bzip2"
+          "lzip"
+          "lzma"
+          "xz"
+          "brotli"
+          "compress"
+          "zstd"
+          "lz4"
+          "archive_color"
+          "bat"
+          "batcat"
+          "pygmentize"
+          "source-highlight"
+          "vimcolor"
+          "code2color"
 
-            "w3m"
-            "lynx"
-            "elinks"
-            "html2text"
-            "xmq"
-            "dtc"
-            "pdftotext"
-            "pdftohtml"
-            "pdfinfo"
-            "ps2ascii"
-            "procyon"
-            "ccze"
-            "mdcat"
-            "pandoc"
-            "docx2txt"
-            "libreoffice"
-            "pptx2md"
-            "mdcat"
-            "xlscat"
-            "odt2txt"
-            "wvText"
-            "catdoc"
-            "broken_catppt"
-            "sxw2txt"
-            "groff"
-            "mandoc"
-            "unrtf"
-            "dvi2tty"
-            "pod2text"
-            "perldoc"
-            "h5dump"
-            "ncdump"
-            "matdump"
-            "djvutxt"
-            "openssl"
-            "gpg"
-            "plistutil"
-            "plutil"
-            "id3v2"
-            "csvlook"
-            "csvtable"
-            "jq"
-            "zlib-flate"
-            "lessfilter"
-            "snap"
-          ]
-          ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
-            # resholve only identifies this on darwin/bsd
-            # call site is guarded by || so it's safe to leave dynamic
-            "locale"
-          ];
+          "w3m"
+          "lynx"
+          "elinks"
+          "html2text"
+          "xmq"
+          "dtc"
+          "pdftotext"
+          "pdftohtml"
+          "pdfinfo"
+          "ps2ascii"
+          "procyon"
+          "ccze"
+          "mdcat"
+          "pandoc"
+          "docx2txt"
+          "libreoffice"
+          "pptx2md"
+          "mdcat"
+          "xlscat"
+          "odt2txt"
+          "wvText"
+          "catdoc"
+          "broken_catppt"
+          "sxw2txt"
+          "groff"
+          "mandoc"
+          "unrtf"
+          "dvi2tty"
+          "pod2text"
+          "perldoc"
+          "h5dump"
+          "ncdump"
+          "matdump"
+          "djvutxt"
+          "openssl"
+          "gpg"
+          "plistutil"
+          "plutil"
+          "id3v2"
+          "csvlook"
+          "csvtable"
+          "jq"
+          "zlib-flate"
+          "lessfilter"
+          "snap"
+          "locale" # call site is guarded by || so it's safe to leave dynamic
+        ];
         builtin = [ "setopt" ];
       };
       execer = [