commit 8b50248846724cff9e72b037db26d7ba1391889d · pyrox.dev/nixpkgs

+29

pkgs/by-name/ht/html2text/gettext-0.25.patch

···

       1
       1
       +
       diff --git a/Makefile.am b/Makefile.am

     

       2
       2
       +
       index af28077..e746147 100644

     

       3
       3
       +
       --- a/Makefile.am

     

       4
       4
       +
       +++ b/Makefile.am

     

       5
       5
       +
       @@ -13,6 +13,8 @@

     

       6
       6
       +
        AUTOMAKE_OPTIONS = foreign

     

       7
       7
       +
        ACLOCAL_AMFLAGS = -I m4

     

       8
       8
       +
        

     

       9
       9
       +
       +SUBDIRS =

     

       10
       10
       +
       +

     

       11
       11
       +
        AM_YFLAGS = -d -Wno-yacc

     

       12
       12
       +
        

     

       13
       13
       +
        bin_PROGRAMS = html2text

     

       14
       14
       +
       diff --git a/configure.ac b/configure.ac

     

       15
       15
       +
       index 999c6fe..30c2536 100644

     

       16
       16
       +
       --- a/configure.ac

     

       17
       17
       +
       +++ b/configure.ac

     

       18
       18
       +
       @@ -15,8 +15,11 @@

     

       19
       19
       +
        

     

       20
       20
       +
        AC_PREREQ([2.71])

     

       21
       21
       +
        AC_INIT([html2text], [2.3.0], [BUG-REPORT-ADDRESS])

     

       22
       22
       +
       +AC_CONFIG_MACRO_DIRS([m4])

     

       23
       23
       +
        AM_INIT_AUTOMAKE

     

       24
       24
       +
        AM_MAINTAINER_MODE([disable])

     

       25
       25
       +
       +AM_GNU_GETTEXT_VERSION([0.20])

     

       26
       26
       +
       +AM_GNU_GETTEXT([external])

     

       27
       27
       +
        AM_ICONV

     

       28
       28
       +
        #AC_CONFIG_SRCDIR([html.h])

     

       29
       29
       +
        #AC_CONFIG_HEADERS([config.h])

+16 -3

pkgs/by-name/ht/html2text/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitLab,

     

       5
       5
       +
         autoconf-archive,

     

       5
       6
        
         autoreconfHook,

     

       7
       7
       +
         bison,

     

       8
       8
       +
         gettext,

     

       6
       9
        
         libiconv,

     

       7
       10
        
       }:

     

       8
       11
        
       

     

       9
       12
        
       stdenv.mkDerivation rec {

     

       10
       13
        
         pname = "html2text";

     

       11
       11
       -
         version = "2.2.3";

     

       14
       14
       +
         version = "2.3.0";

     

       12
       15
        
       

     

       13
       16
        
         src = fetchFromGitLab {

     

       14
       17
        
           owner = "grobian";

     

       15
       18
        
           repo = "html2text";

     

       16
       19
        
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-7Ch51nJ5BeRqs4PEIPnjCGk+Nm2ydgJQCtkcpihXun8=";

     

       20
       20
       +
           hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ=";

     

       18
       21
        
         };

     

       19
       22
        
       

     

       20
       20
       -
         nativeBuildInputs = [ autoreconfHook ];

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           autoconf-archive

     

       25
       25
       +
           autoreconfHook

     

       26
       26
       +
           bison

     

       27
       27
       +
           gettext

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         # These changes have all been made in HEAD, across several commits

     

       31
       31
       +
         # amongst other changes.

     

       32
       32
       +
         # See https://gitlab.com/grobian/html2text/-/merge_requests/57

     

       33
       33
       +
         patches = [ ./gettext-0.25.patch ];

     

       21
       34
        
       

     

       22
       35
        
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;

     

       23
       36