From de0a7795c3ca431948a9184e540fc7cac7ca64ee Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 14 Jan 2023 13:11:40 -0500 Subject: [PATCH] omake_rc1: remove --- .../tools/ocaml/omake/0.9.8.6-rc1.nix | 44 ------------------- pkgs/development/tools/ocaml/omake/warn.patch | 10 ----- pkgs/top-level/ocaml-packages.nix | 2 - 3 files changed, 56 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix delete mode 100644 pkgs/development/tools/ocaml/omake/warn.patch 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 090794b3311..00000000000 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib, stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.6-0.rc1"; - webpage = "http://omake.metaprl.org"; -in - -if lib.versionAtLeast ocaml.version "4.06" -then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; - sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; - }; - patchFlags = [ "-p0" ]; - patches = [ ./warn.patch ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml ncurses ]; - - dontInstall = true; - 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 4459e89d7f9..00000000000 --- 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/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0d160237754..8fd6b40ef19 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1632,8 +1632,6 @@ let ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; - omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; hol_light = callPackage ../applications/science/logic/hol_light { };