diff options
| author | Christophe Raffalli <raffalli@univ-savoie.fr> | 2013-06-04 20:33:31 +0200 |
|---|---|---|
| committer | Christophe Raffalli <raffalli@univ-savoie.fr> | 2013-06-07 21:40:37 +0200 |
| commit | 87e10894981e4a07f8c320c8ece7100f26fd96ca (patch) | |
| tree | 940338be156d8a7148e17c921557aa9b3191fa00 /pkgs | |
| parent | b3fa714f1fc7d550199404332a21e11ad2ab6f84 (diff) | |
| download | nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.tar nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.tar.gz nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.tar.bz2 nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.tar.lz nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.tar.xz nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.tar.zst nixlib-87e10894981e4a07f8c320c8ece7100f26fd96ca.zip | |
Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because this is a rc1.
This is necessary to compile the latest camlimages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix | 37 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix new file mode 100644 index 000000000000..48a6b3c1f64d --- /dev/null +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: +let + pname = "omake"; + version = "0.9.8.6-0.rc1"; + webpage = "http://omake.metaprl.org"; +in +stdenv.mkDerivation { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/downloads/${pname}-${version}.tar.gz"; + sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; + }; + patchFlags = "-p0"; + patches = [ ./warn.patch ]; + + buildInputs = [ ocaml makeWrapper ncurses ]; + + phases = "unpackPhase patchPhase buildPhase"; + buildPhase = '' + make bootstrap + make PREFIX=$out all + make PREFIX=$out install + ''; +# prefixKey = "-prefix "; +# +# configureFlags = if transitional then "--transitional" else "--strict"; +# +# buildFlags = "world.opt"; + + meta = { + description = "Omake build system"; + homepage = "${webpage}"; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89d265c99cfa..4bc2875b8f14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3385,6 +3385,7 @@ let noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; openocd = callPackage ../development/tools/misc/openocd { }; |