about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix38
-rw-r--r--pkgs/development/tools/ocaml/omake/warn.patch10
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/ocaml-packages.nix2
4 files changed, 0 insertions, 52 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
deleted file mode 100644
index 9f318afc67d7..000000000000
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{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 = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${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";
-    platforms = ocaml.meta.platforms or [];
-  };
-}
diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch
deleted file mode 100644
index 4459e89d7f9c..000000000000
--- a/pkgs/development/tools/ocaml/omake/warn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om
---- ../omake-0.9.8.6.ori/lib/build/OCaml.om	2008-03-05 01:07:25.000000000 +0000
-+++ ./lib/build/OCaml.om	2013-06-01 15:52:37.000000000 +0000
-@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS  =
--public.OCAMLFLAGS    = -warn-error A
-+public.OCAMLFLAGS    =
- public.OCAMLCFLAGS   = -g
-Seulement dans ./lib/build: OCaml.om~
-Seulement dans .: warn.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a554f353d1eb..8f512db38958 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6339,8 +6339,6 @@ in
     inherit (ocamlPackages_4_02) ocaml;
   };
 
-  inherit (ocamlPackages) omake_rc1;
-
   omniorb = callPackage ../development/tools/omniorb { };
 
   opengrok = callPackage ../development/tools/misc/opengrok { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 6e3f98c7ba2e..dc497b125e61 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -649,8 +649,6 @@ let
 
     trv = callPackage ../development/tools/misc/trv { };
 
-    omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
-
     verasco = callPackage ../development/tools/analysis/verasco (
       if system == "x86_64-linux"
       then { tools = pkgs.pkgsi686Linux.stdenv.cc; }