Merge pull request #521 from bjornfor/ninja

Ninja: some small changes
This commit is contained in:
Evgeny Egorochkin 2013-05-11 04:33:10 -07:00
commit f0a495e886
3 changed files with 41 additions and 22 deletions

View File

@ -0,0 +1,39 @@
{ stdenv, fetchurl, unzip, python, asciidoc, re2c }:
stdenv.mkDerivation rec {
name = "ninja-${version}";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/martine/ninja/archive/v${version}.zip";
sha256 = "15ynh806ah37bqb57hcs3mj2g82900sncp6n3bssfggb4azgjlh3";
};
buildInputs = [ python asciidoc unzip re2c ];
buildPhase = ''
python bootstrap.py
asciidoc doc/manual.asciidoc
'';
installPhase = ''
mkdir -p $out/bin
cp ninja $out/bin/
mkdir -p $out/share/doc/ninja
cp doc/manual.asciidoc $out/share/doc/ninja/
cp doc/manual.html $out/share/doc/ninja/
'';
meta = {
description = "Small build system with a focus on speed";
longDescription = ''
Ninja is a small build system with a focus on speed. It differs from
other build systems in two major respects: it is designed to have its
input files generated by a higher-level build system, and it is designed
to run builds as fast as possible.
'';
homepage = http://martine.github.io/ninja/;
license = stdenv.lib.licenses.asl20;
};
}

View File

@ -3328,6 +3328,8 @@ let
licenseAccepted = (config.neoload.accept_license or false); licenseAccepted = (config.neoload.accept_license or false);
}; };
ninja = callPackage ../development/tools/build-managers/ninja { };
noweb = callPackage ../development/tools/literate-programming/noweb { }; noweb = callPackage ../development/tools/literate-programming/noweb { };
omake = callPackage ../development/tools/ocaml/omake { }; omake = callPackage ../development/tools/ocaml/omake { };

View File

@ -2603,28 +2603,6 @@ pythonPackages = python.modules // rec {
}; };
}); });
ninja = pkgs.stdenv.mkDerivation rec {
name = "ninja-1.2.0";
src = fetchurl {
url = "https://github.com/martine/ninja/archive/v1.2.0.zip";
sha256 = "15ynh806ah37bqb57hcs3mj2g82900sncp6n3bssfggb4azgjlh3";
};
buildInputs = [ python pkgs.asciidoc pkgs.unzip pkgs.re2c ];
buildPhase = ''
python bootstrap.py
asciidoc doc/manual.asciidoc
'';
installPhase = ''
mkdir -p $out/bin
cp ninja $out/bin/
mkdir -p $out/share/doc/ninja
cp doc/manual.asciidoc $out/share/doc/ninja/
cp doc/manual.html $out/share/doc/ninja/
'';
homepage = http://martine.github.io/ninja/;
};
nose = buildPythonPackage rec { nose = buildPythonPackage rec {
name = "nose-1.2.1"; name = "nose-1.2.1";