ocamlPackages.camlp5: remove legacy version (7.06)

2 files changed, 4 insertions, 119 deletions

diff --git a/pkgs/development/tools/ocaml/camlp5/META b/pkgs/development/tools/ocaml/camlp5/META
deleted file mode 100644
index e13b108ff247..000000000000
--- a/pkgs/development/tools/ocaml/camlp5/META
+++ /dev/null
@@ -1,94 +0,0 @@
-# Specifications for the "camlp5" preprocessor:
-requires = ""
-version = "[distributed with Ocaml]"
-description = "Base for camlp5 syntax extensions"
-
-# For the toploop:
-archive(byte,toploop,camlp5o) = "camlp5o.cma"
-archive(byte,toploop,camlp5r) = "camlp5r.cma"
-
-# Scheme-like syntax:
-# Do #predicates "syntax,camlp5scheme", followed by #require "camlp5"
-archive(byte,toploop,camlp5scheme) = "camlp5sch.cma"
-
-# Standard ML-like syntax:
-# Do #predicates "syntax,camlp5sml", followed by #require "camlp5"
-archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo"
-
-# Lisp-like syntax:
-# Do #predicates "syntax,camlp5lisp", followed by #require "camlp5"
-archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo"
-
-# For the preprocessor itself:
-archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo"
-archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo"
-archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo"
-archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo"
-archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo"
-preprocessor = "camlp5 -nolib"
-
-package "gramlib" (
-  requires(toploop) = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Grammar library to create syntax extensions"
-  archive(byte) = "gramlib.cma"
-  archive(byte,toploop) = ""  # already contained in camlp5*.cma
-  archive(native) = "gramlib.cmxa"
-)
-
-package "quotations" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: Quotations to create AST nodes"
-  archive(syntax,preprocessor) = "q_MLast.cmo"
-  archive(syntax,toploop) = "q_MLast.cmo"
-)
-
-package "phony_quotations" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: Phony quotations"
-  archive(syntax,preprocessor) = "q_phony.cmo"
-  archive(syntax,toploop) = "q_phony.cmo"
-)
-
-package "extend" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: EXTEND the camlp5 grammar"
-  archive(syntax,preprocessor) = "pa_extend.cmo"
-  archive(syntax,toploop) = "pa_extend.cmo"
-)
-
-package "extfun" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: Extensible functions"
-  archive(syntax,preprocessor) = "pa_extfun.cmo"
-  archive(syntax,toploop) = "pa_extfun.cmo"
-)
-
-package "fstream" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: Functional stream parsers"
-  archive(syntax,preprocessor) = "pa_fstream.cmo"
-  archive(syntax,toploop) = "pa_fstream.cmo"
-)
-
-package "macro" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: Conditional compilation"
-  archive(syntax,preprocessor) = "pa_macro.cmo"
-  archive(syntax,toploop) = "pa_macro.cmo"
-)
-
-package "unit_constraints" (
-  requires = "camlp5"
-  version = "[distributed with Ocaml]"
-  description = "Syntax extension: Type constraints of type unit (revised syntax only)"
-  archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo"
-  archive(syntax,toploop,camlp5r) = "pa_ru.cmo"
-  error(syntax,-camlp5r) = "Not available"
-)
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index ca053138d800..efd6e562c29a 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,35 +1,16 @@
-{ stdenv, fetchzip, ocaml, legacy ? false }:
-
-let params =
-  if legacy then {
-    minor-version = "06";
-    sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf";
-  } else {
-    minor-version = "07";
-    sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn";
-  };
-  metafile = ./META;
-  opt = stdenv.lib.optionalString legacy;
-in
+{ stdenv, fetchzip, ocaml }:
 
 stdenv.mkDerivation {
 
-  name = "camlp5-7.${params.minor-version}";
+  name = "camlp5-7.07";
 
   src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel7${params.minor-version}.tar.gz";
-    inherit (params) sha256;
+    url = "https://github.com/camlp5/camlp5/archive/rel707.tar.gz";
+    sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn";
   };
 
   buildInputs = [ ocaml ];
 
-  postPatch = opt ''
-    for p in compile/compile.sh config/Makefile.tpl test/Makefile test/check_ocaml_versions.sh
-    do
-      substituteInPlace $p --replace '/bin/rm' rm
-    done
-  '';
-
   prefixKey = "-prefix ";
 
   preConfigure = "configureFlagsArray=(--strict" +
@@ -37,8 +18,6 @@ stdenv.mkDerivation {
 
   buildFlags = "world.opt";
 
-  postInstall = opt "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
-
   dontStrip = true;
 
   meta = with stdenv.lib; {