mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
html2text: 2.3.0 -> 2.4.0 (#515096)
This commit is contained in:
commit
869a1ca611
2 changed files with 2 additions and 38 deletions
|
|
@ -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])
|
||||
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue