colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ninja: move out of pythonPackages

Browse Source 
ninja is a build system written in C++ that just happens to use python
to build/install *itself*. It is not a "python package".

After this commit, ninja will be at pkgs.ninja instead of
pkgs.pythonPackages.ninja.
This commit is contained in:
Bjørn Forsman 2013-05-11 11:39:52 +02:00
parent 7044fd8e05
commit 5ab346a327
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/tools/build-managers/ninja/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, unzip, python, asciidoc, re2c }:
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 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/
'';
homepage = http://martine.github.io/ninja/;
}

2
pkgs/top-level/all-packages.nix
View File

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

22
pkgs/top-level/python-packages.nix
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 {
name = "nose-1.2.1";