From 962d5903e82b28c46e017597a7008d34cc5f5ae4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:28:20 +0200 Subject: [PATCH 1/8] ansifilter: use finalAttrs pattern --- pkgs/by-name/an/ansifilter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 70bf4c82dc06..1d56a89594f4 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -7,12 +7,12 @@ lua, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ansifilter"; version = "2.22"; src = fetchurl { - url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; + url = "http://www.andre-simon.de/zip/ansifilter-${finalAttrs.version}.tar.bz2"; hash = "sha256-zP9BynQLgTv5EDhotQAPQkPTKnUwTqkpohTEm5Q+zJM="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) From 3a6e668436f5ba3d3ab4afc6e263ed44fab65139 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:28:54 +0200 Subject: [PATCH 2/8] ansifilter: no with lib; in meta --- pkgs/by-name/an/ansifilter/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 1d56a89594f4..29dcdd7026cd 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { "conf_dir=/etc/ansifilter" ]; - meta = with lib; { + meta = { description = "Tool to convert ANSI to other formats"; mainProgram = "ansifilter"; longDescription = '' @@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: { (HTML, TeX, LaTeX, RTF, Pango or BBCode) ''; homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) From c05be33f5a920be815725d939b76fa3547ab2ce3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:29:16 +0200 Subject: [PATCH 3/8] ansifilter: adopt --- pkgs/by-name/an/ansifilter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 29dcdd7026cd..8e35f25764dd 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ doronbehar ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) From d05a1c0454af187f13fbd68601524ba80c63a1ef Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:30:05 +0200 Subject: [PATCH 4/8] ansifilter: small arguments ordering and formatting --- pkgs/by-name/an/ansifilter/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 8e35f25764dd..2be38ea49c23 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -1,7 +1,7 @@ { - fetchurl, lib, stdenv, + fetchurl, pkg-config, boost, lua, @@ -16,7 +16,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zP9BynQLgTv5EDhotQAPQkPTKnUwTqkpohTEm5Q+zJM="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; buildInputs = [ boost lua From c06a9a9521af14303be848ba91840271ecb2ce71 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:45:57 +0200 Subject: [PATCH 5/8] ansifilter: update to unambigous gpl3Plus license --- pkgs/by-name/an/ansifilter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 2be38ea49c23..7b80800a8059 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { (HTML, TeX, LaTeX, RTF, Pango or BBCode) ''; homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ doronbehar ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; From 8a7639f1d1ad40455a92cd05cf28d57099bd1f47 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:46:55 +0200 Subject: [PATCH 6/8] ansifilter: use GitLab src Upstream's andre-simon.de website is not using SSL, and using the GitLab repo should be more reliable in terms of automatic updates. --- pkgs/by-name/an/ansifilter/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 7b80800a8059..7a039987eb8a 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, pkg-config, boost, lua, @@ -11,9 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ansifilter"; version = "2.22"; - src = fetchurl { - url = "http://www.andre-simon.de/zip/ansifilter-${finalAttrs.version}.tar.bz2"; - hash = "sha256-zP9BynQLgTv5EDhotQAPQkPTKnUwTqkpohTEm5Q+zJM="; + src = fetchFromGitLab { + owner = "saalen"; + repo = "ansifilter"; + tag = finalAttrs.version; + hash = "sha256-jCgucC5mHkDwVtTKP92RBStxpouQCR7PHWkDt0y+9BM="; }; nativeBuildInputs = [ @@ -35,13 +37,14 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "Tool to convert ANSI to other formats"; + description = "ANSI sequence filter"; mainProgram = "ansifilter"; longDescription = '' - Tool to remove ANSI or convert them to another format - (HTML, TeX, LaTeX, RTF, Pango or BBCode) + Ansifilter handles text files containing ANSI terminal escape codes. + The command sequences may be stripped or be interpreted to generate formatted + output (HTML, RTF, TeX, LaTeX, BBCode, Pango). ''; - homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html"; + homepage = "https://gitlab.com/saalen/ansifilter"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ doronbehar ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; From cd3e8961a6a1fa253460d15e1f64087d394fb187 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:47:40 +0200 Subject: [PATCH 7/8] ansifilter: use --replace-fail in gzip substitution --- pkgs/by-name/an/ansifilter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 7a039987eb8a..11a138863a79 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # avoid timestamp non-determinism with '-n' - substituteInPlace makefile --replace 'gzip -9f' 'gzip -9nf' + substituteInPlace makefile --replace-fail 'gzip -9f' 'gzip -9nf' ''; makeFlags = [ From dde11588da01c05d08c3d751befce65a5c084f20 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Dec 2025 11:49:01 +0200 Subject: [PATCH 8/8] ansifilter: remove unused lua & boost buildInputs --- pkgs/by-name/an/ansifilter/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/an/ansifilter/package.nix b/pkgs/by-name/an/ansifilter/package.nix index 11a138863a79..4e8ad58e7b43 100644 --- a/pkgs/by-name/an/ansifilter/package.nix +++ b/pkgs/by-name/an/ansifilter/package.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitLab, pkg-config, - boost, - lua, }: stdenv.mkDerivation (finalAttrs: { @@ -21,10 +19,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost - lua - ]; postPatch = '' # avoid timestamp non-determinism with '-n'