Revert "omake: remove 0.9.8.6-rc1"

This reverts commit e672fbc6f0e0dd503f78e0c23e6de1795bf81b8f.

+52
+38
pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
···
··· 1 + {stdenv, fetchurl, makeWrapper, ocaml, ncurses}: 2 + let 3 + pname = "omake"; 4 + version = "0.9.8.6-0.rc1"; 5 + webpage = "http://omake.metaprl.org"; 6 + in 7 + stdenv.mkDerivation { 8 + 9 + name = "${pname}-${version}"; 10 + 11 + src = fetchurl { 12 + url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; 13 + sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; 14 + }; 15 + patchFlags = "-p0"; 16 + patches = [ ./warn.patch ]; 17 + 18 + buildInputs = [ ocaml makeWrapper ncurses ]; 19 + 20 + phases = "unpackPhase patchPhase buildPhase"; 21 + buildPhase = '' 22 + make bootstrap 23 + make PREFIX=$out all 24 + make PREFIX=$out install 25 + ''; 26 + # prefixKey = "-prefix "; 27 + # 28 + # configureFlags = if transitional then "--transitional" else "--strict"; 29 + # 30 + # buildFlags = "world.opt"; 31 + 32 + meta = { 33 + description = "Omake build system"; 34 + homepage = "${webpage}"; 35 + license = "GPL"; 36 + platforms = ocaml.meta.platforms or []; 37 + }; 38 + }
+10
pkgs/development/tools/ocaml/omake/warn.patch
···
··· 1 + diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om 2 + --- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 3 + +++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000 4 + @@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS 5 + public.OCAMLPPFLAGS = 6 + -public.OCAMLFLAGS = -warn-error A 7 + +public.OCAMLFLAGS = 8 + public.OCAMLCFLAGS = -g 9 + Seulement dans ./lib/build: OCaml.om~ 10 + Seulement dans .: warn.patch
+2
pkgs/top-level/all-packages.nix
··· 6376 inherit (ocamlPackages_4_02) ocaml; 6377 }; 6378 6379 omniorb = callPackage ../development/tools/omniorb { }; 6380 6381 opengrok = callPackage ../development/tools/misc/opengrok { };
··· 6376 inherit (ocamlPackages_4_02) ocaml; 6377 }; 6378 6379 + inherit (ocamlPackages) omake_rc1; 6380 + 6381 omniorb = callPackage ../development/tools/omniorb { }; 6382 6383 opengrok = callPackage ../development/tools/misc/opengrok { };
+2
pkgs/top-level/ocaml-packages.nix
··· 649 650 trv = callPackage ../development/tools/misc/trv { }; 651 652 verasco = callPackage ../development/tools/analysis/verasco ( 653 if system == "x86_64-linux" 654 then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
··· 649 650 trv = callPackage ../development/tools/misc/trv { }; 651 652 + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; 653 + 654 verasco = callPackage ../development/tools/analysis/verasco ( 655 if system == "x86_64-linux" 656 then { tools = pkgs.pkgsi686Linux.stdenv.cc; }