diff --git a/pkgs/by-name/ht/html2text/gettext-0.25.patch b/pkgs/by-name/ht/html2text/gettext-0.25.patch deleted file mode 100644 index ebc2aa9a0188..000000000000 --- a/pkgs/by-name/ht/html2text/gettext-0.25.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index af28077..e746147 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,6 +13,8 @@ - AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 - -+SUBDIRS = -+ - AM_YFLAGS = -d -Wno-yacc - - bin_PROGRAMS = html2text -diff --git a/configure.ac b/configure.ac -index 999c6fe..30c2536 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,8 +15,11 @@ - - AC_PREREQ([2.71]) - AC_INIT([html2text], [2.3.0], [BUG-REPORT-ADDRESS]) -+AC_CONFIG_MACRO_DIRS([m4]) - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE([disable]) -+AM_GNU_GETTEXT_VERSION([0.20]) -+AM_GNU_GETTEXT([external]) - AM_ICONV - #AC_CONFIG_SRCDIR([html.h]) - #AC_CONFIG_HEADERS([config.h]) diff --git a/pkgs/by-name/ht/html2text/package.nix b/pkgs/by-name/ht/html2text/package.nix index 1f996d3d620a..eeba214de0e5 100644 --- a/pkgs/by-name/ht/html2text/package.nix +++ b/pkgs/by-name/ht/html2text/package.nix @@ -5,33 +5,26 @@ autoconf-archive, autoreconfHook, bison, - gettext, libiconv, }: stdenv.mkDerivation (finalAttrs: { pname = "html2text"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitLab { owner = "grobian"; repo = "html2text"; rev = "v${finalAttrs.version}"; - hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ="; + hash = "sha256-C229ogU2YStXWizb51whQXc6oSkVnclnOeJYlIMvHWM="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook bison - gettext ]; - # These changes have all been made in HEAD, across several commits - # amongst other changes. - # See https://gitlab.com/grobian/html2text/-/merge_requests/57 - patches = [ ./gettext-0.25.patch ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = {