Merge pull request #61808 from mmahut/indent

indent: 2.2.10 -> 2.2.12
This commit is contained in:
Matthew Bauer 2019-05-21 18:13:19 -05:00 committed by GitHub
commit 6bba2572c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 7 deletions

View file

@ -0,0 +1,15 @@
diff --git a/config.h.in b/config.h.in
index 07e6fce..0c57e2a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -432,8 +432,8 @@
# endif
# define _GL_EXTERN_INLINE extern
#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
+# define _GL_INLINE static
+# define _GL_EXTERN_INLINE static
#endif
#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)

View file

@ -1,23 +1,27 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, texinfo }:
stdenv.mkDerivation rec {
name = "indent-2.2.10";
name = "indent-2.2.12";
src = fetchurl {
url = "mirror://gnu/indent/${name}.tar.gz";
sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7";
};
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's|#include <malloc.h>|#include <malloc/malloc.h>|' ./man/texinfo2man.c
'';
patches = [ ./darwin.patch ];
buildInputs = [ texinfo ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
"-Wno-implicit-function-declaration";
hardeningDisable = [ "format" ];
meta = {
homepage = https://www.gnu.org/software/indent/;
homepage = "https://www.gnu.org/software/indent/";
description = "A source code reformatter";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.mmahut ];
platforms = stdenv.lib.platforms.unix;
};
}