diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-28 13:11:09 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-28 13:11:09 +0000 |
| commit | cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3 (patch) | |
| tree | 11a7741384c5b87ec0c35d96f33aef7e12642748 | |
| parent | cb1b3a0dbe29556cf91800c28ba50c0ef5440ce5 (diff) | |
| download | nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.tar nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.tar.gz nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.tar.bz2 nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.tar.lz nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.tar.xz nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.tar.zst nixpkgs-cbfbaf736a0e697c0ee8188e9f68cfde5bd703e3.zip | |
* GNU Indent updated to 2.2.10.
svn path=/nixpkgs/trunk/; revision=17990
| -rw-r--r-- | pkgs/development/tools/misc/indent/2.2.9.nix | 27 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/indent/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 25 insertions, 29 deletions
diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix deleted file mode 100644 index df5aab7a313..00000000000 --- a/pkgs/development/tools/misc/indent/2.2.9.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix new file mode 100644 index 00000000000..00ff11c3c88 --- /dev/null +++ b/pkgs/development/tools/misc/indent/default.nix @@ -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+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9230ed10e63..8fc43f7e4e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |