From eaf0de5985ef1316323c7da4026ed268399a3589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 10 Oct 2018 16:32:05 +0200 Subject: [PATCH] ulex: remove version 0.8 --- .../ocaml-modules/ulex/0.8/camlp5.patch | 72 ------------------- .../ocaml-modules/ulex/0.8/default.nix | 36 ---------- .../ocaml-modules/ulex/0.8/meta_version.patch | 10 --- pkgs/top-level/ocaml-packages.nix | 4 -- 4 files changed, 122 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/default.nix delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch diff --git a/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch b/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch deleted file mode 100644 index 2fa92527035e..000000000000 --- a/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch +++ /dev/null @@ -1,72 +0,0 @@ -Author: Stefano Zacchiroli -Description: build (and install) using camlp5 instead of camlp4 ---- ulex0.8.orig/META -+++ ulex0.8/META -@@ -1,5 +1,5 @@ - version = "0.8" --requires = "camlp4" -+requires = "camlp5" - description = "Runtime support for ulex" - archive(byte) = "ulexing.cma" - archive(native) = "ulexing.cmxa" ---- ulex0.8.orig/Makefile -+++ ulex0.8/Makefile -@@ -20,7 +20,7 @@ - ocamlopt -a -o ulexing.cmxa $(ULEXING) - - pa_ulex.cma: $(ULEX) -- ocamlc -a -o pa_ulex.cma -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -I +camlp4 $(ULEX) -+ ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_extend.cmo q_MLast.cmo' -I `camlp5 -where` $(ULEX) - - pa_ulex.ml: pa_ulex.ml.src - ocaml mk_pa_ulex.ml -@@ -29,14 +29,14 @@ - rm -f *.cm* *~ test custom_ulexing *.o *.a *.html *.css pa_ulex.ml - - view_test: pa_ulex.cma -- camlp4o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml -+ camlp5o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml - - run_test: ulexing.cma pa_ulex.cma -- ocamlc -o test -pp 'camlp4o ./pa_ulex.cma' ulexing.cma test.ml -+ ocamlc -o test -pp 'camlp5o ./pa_ulex.cma' ulexing.cma test.ml - ./test - - custom_ulexing: ulexing.cma pa_ulex.cma -- ocamlc -o custom_ulexing -pp 'camlp4o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml -+ ocamlc -o custom_ulexing -pp 'camlp5o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml - - - doc: ---- ulex0.8.orig/README -+++ ulex0.8/README -@@ -142,7 +142,7 @@ - - Compilation of OCaml files with lexer specifications: - -- ocamlfind ocamlc -c -package ulex -syntax camlp4o my_file.ml -+ ocamlfind ocamlc -c -package ulex -syntax camlp5o my_file.ml - - When linking, you must also include the ulex package: - ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo ---- ulex0.8.orig/mk_pa_ulex.ml -+++ ulex0.8/mk_pa_ulex.ml -@@ -1,10 +1,4 @@ - let s = float_of_string (String.sub (Sys.ocaml_version) 0 4) in --if (s < 3.09) then ( - print_endline "Old camlp4 (loc)"; - Sys.command "sed s/_loc/loc/ < pa_ulex.ml.src > pa_ulex.ml" --) --else ( -- print_endline "New camlp4 (_loc)"; -- Sys.command "cp pa_ulex.ml.src pa_ulex.ml" --) - ---- ulex0.8.orig/pa_ulex.ml.src -+++ ulex0.8/pa_ulex.ml.src -@@ -1,4 +1,4 @@ --let _loc = (Lexing.dummy_pos,Lexing.dummy_pos) -+let _loc = Stdpp.dummy_loc - - (* Named regexp *) - diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix deleted file mode 100644 index 6c0cf9214f29..000000000000 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, camlp5 }: - -let - pname = "ulex"; -in - -if stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "ulex-0.8 is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.8"; - - src = fetchurl { - url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz"; - sha256 = "19faabg8hzz155xlzmjwsl59d7slahb5m1l9zh1fqvvpp81r26cp"; - }; - - buildInputs = [ocaml findlib camlp5]; - - createFindlibDestdir = true; - - patches = [ ./meta_version.patch ./camlp5.patch ]; - - propagatedBuildInputs = [ camlp5 ]; - - buildFlags = "all all.opt"; - - meta = { - homepage = http://www.cduce.org/download.html; - description = "A lexer generator for Unicode and OCaml"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - }; -} diff --git a/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch b/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch deleted file mode 100644 index 7a39510cf0b4..000000000000 --- a/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch +++ /dev/null @@ -1,10 +0,0 @@ -Author: Stefano Zacchiroli -Description: fix a typo in the findlib package version number specified in META ---- ulex0.8.orig/META -+++ ulex0.8/META -@@ -1,4 +1,4 @@ --version = "0.7" -+version = "0.8" - requires = "camlp4" - description = "Runtime support for ulex" - archive(byte) = "ulexing.cma" diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5f6d6fc9bc1d..0840aa66100b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -592,10 +592,6 @@ let ulex = callPackage ../development/ocaml-modules/ulex { }; - ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { - camlp5 = camlp5_transitional; - }; - textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; tls = callPackage ../development/ocaml-modules/tls {