From 4b487410b65093fdb9de269b0b86aeee1ca481d3 Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 5 Jan 2025 18:26:58 +0000 Subject: [PATCH 1/2] lesspipe: 2.14 -> 2.17 --- pkgs/by-name/le/lesspipe/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index a9c135010efe..03fc187d3bb5 100644 --- 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 = [ @@ -162,11 +162,7 @@ stdenv.mkDerivation rec { "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" + "locale" # call site is guarded by || so it's safe to leave dynamic ]; builtin = [ "setopt" ]; }; From 7233b53e3c3d484f7f29eca9073135dbf1a871b3 Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 5 Jan 2025 18:43:46 +0000 Subject: [PATCH 2/2] lesspipe: reformat --- pkgs/by-name/le/lesspipe/package.nix | 155 +++++++++++++-------------- 1 file changed, 77 insertions(+), 78 deletions(-) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index 03fc187d3bb5..0fd06e2758de 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -85,85 +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" - "locale" # call site is guarded by || so it's safe to leave dynamic - ]; + "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 = [