* GNU Indent updated to 2.2.10.

svn path=/nixpkgs/trunk/; revision=17990
This commit is contained in:
Eelco Dolstra 2009-10-28 13:11:09 +00:00
parent cb1b3a0dbe
commit cbfbaf736a
3 changed files with 25 additions and 29 deletions

View File

@ -1,27 +0,0 @@
args : with args;
let bd = builderDefs; in
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz;
sha256 = "0rp4divzv5xyflm8ixpp2isa092n0nmhgmhvz56db7k3lnyqg4qb";
};
buildInputs = [];
configureFlags = [];
preBuild = bd.stringsWithDeps.fullDepEntry ("
sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h
sed -e '/extern FILE [*]output/a#endif' -i src/indent.h
sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c
") ["minInit" "doUnpack"];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "indent";
builder = writeScript (name + "-builder")
(textClosure localDefs ["doConfigure" "preBuild" "doMakeInstall" "doForceShare" "doPropagate"]);
meta = {
description = "GNU Indent - a source text formatter";
inherit src;
};
}

View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "indent-2.2.10";
src = fetchurl {
url = "ftp://ftp.gnu.org/gnu/indent/${name}.tar.gz";
sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
};
preBuild =
''
sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h
sed -e '/extern FILE [*]output/a#endif' -i src/indent.h
sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c
'';
meta = {
homepage = http://www.gnu.org/software/indent/;
description = "A source code reformatter";
license = "GPLv3+";
};
}

View File

@ -2826,8 +2826,8 @@ let
inherit (perlPackages) XMLSimple;
};
indent = composedArgsAndFun (selectVersion ../development/tools/misc/indent "2.2.9") {
inherit fetchurl stdenv builderDefs;
indent = import ../development/tools/misc/indent {
inherit fetchurl stdenv;
};
jikespg = import ../development/tools/parsing/jikespg {