diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-21 18:13:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-21 18:13:19 -0500 |
commit | 6bba2572c3bcfa75c73b8bd9db3f192010bb89c5 (patch) | |
tree | 70b7e2deef98ed11657c74e5fa226208f7a92f9a /pkgs | |
parent | 2ec33d12a251cbcee094c8dfee1ea977441ff012 (diff) | |
parent | 77908680f27882f7312c5b2c3dd34264e437eb49 (diff) | |
download | nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.tar nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.tar.gz nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.tar.bz2 nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.tar.lz nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.tar.xz nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.tar.zst nixpkgs-6bba2572c3bcfa75c73b8bd9db3f192010bb89c5.zip |
Merge pull request #61808 from mmahut/indent
indent: 2.2.10 -> 2.2.12
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/indent/darwin.patch | 15 | ||||
-rw-r--r-- | pkgs/development/tools/misc/indent/default.nix | 18 |
2 files changed, 26 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/development/tools/misc/indent/darwin.patch new file mode 100644 index 00000000000..5458a0d93bf --- /dev/null +++ b/pkgs/development/tools/misc/indent/darwin.patch @@ -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__) diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 996043c16d8..c4b5fecca74 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -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; }; } |