Merge pull request #48159 from Zimmi48/remove-camlp5-transitional
Remove camlp5 transitional
This commit is contained in:
commit
c45a6fa041
pkgs
applications/science/logic
development/ocaml-modules
top-level
@ -27,7 +27,6 @@ let
|
|||||||
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
|
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
|
||||||
}."${version}";
|
}."${version}";
|
||||||
coq-version = builtins.substring 0 3 version;
|
coq-version = builtins.substring 0 3 version;
|
||||||
camlp5 = ocamlPackages.camlp5_strict;
|
|
||||||
ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
||||||
csdpPatch = if csdp != null then ''
|
csdpPatch = if csdp != null then ''
|
||||||
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
|
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
|
||||||
@ -37,8 +36,8 @@ self = stdenv.mkDerivation {
|
|||||||
name = "coq-${version}";
|
name = "coq-${version}";
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit coq-version camlp5;
|
inherit coq-version;
|
||||||
inherit (ocamlPackages) ocaml findlib num;
|
inherit (ocamlPackages) ocaml camlp5 findlib num;
|
||||||
emacsBufferSetup = pkgs: ''
|
emacsBufferSetup = pkgs: ''
|
||||||
; Propagate coq paths to children
|
; Propagate coq paths to children
|
||||||
(inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
|
(inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
|
||||||
@ -93,7 +92,7 @@ self = stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ]
|
buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ])
|
||||||
++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
|
++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
name = "prooftree-${version}";
|
name = "prooftree-${version}";
|
||||||
version = "0.12";
|
version = "0.13";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz";
|
url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz";
|
||||||
sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m";
|
sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5_strict
|
{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5
|
||||||
, ppx_tools_versioned, ppx_deriving, re
|
, ppx_tools_versioned, ppx_deriving, re
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ ocaml findlib ppx_tools_versioned ];
|
buildInputs = [ ocaml findlib ppx_tools_versioned ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ camlp5_strict ppx_deriving re ];
|
propagatedBuildInputs = [ camlp5 ppx_deriving re ];
|
||||||
|
|
||||||
createFindlibDestdir = true;
|
createFindlibDestdir = true;
|
||||||
|
|
||||||
|
@ -1,72 +0,0 @@
|
|||||||
Author: Stefano Zacchiroli <zack@debian.org>
|
|
||||||
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 *)
|
|
||||||
|
|
@ -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 ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
Author: Stefano Zacchiroli <zack@debian.org>
|
|
||||||
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"
|
|
@ -21276,10 +21276,7 @@ with pkgs;
|
|||||||
|
|
||||||
libpoly = callPackage ../applications/science/logic/poly {};
|
libpoly = callPackage ../applications/science/logic/poly {};
|
||||||
|
|
||||||
prooftree = (with ocaml-ng.ocamlPackages_4_01_0;
|
prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { };
|
||||||
callPackage ../applications/science/logic/prooftree {
|
|
||||||
camlp5 = camlp5_transitional;
|
|
||||||
});
|
|
||||||
|
|
||||||
prover9 = callPackage ../applications/science/logic/prover9 { };
|
prover9 = callPackage ../applications/science/logic/prover9 { };
|
||||||
|
|
||||||
|
@ -56,8 +56,7 @@ in rec {
|
|||||||
filterCoqPackages coq self;
|
filterCoqPackages coq self;
|
||||||
|
|
||||||
coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
|
coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
|
||||||
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
|
inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5;
|
||||||
camlp5 = ocamlPackages_4_02.camlp5_transitional;
|
|
||||||
};
|
};
|
||||||
coq_8_5 = callPackage ../applications/science/logic/coq {
|
coq_8_5 = callPackage ../applications/science/logic/coq {
|
||||||
ocamlPackages = ocamlPackages_4_05;
|
ocamlPackages = ocamlPackages_4_05;
|
||||||
|
@ -88,15 +88,10 @@ let
|
|||||||
then callPackage ../development/tools/ocaml/camlp4 { }
|
then callPackage ../development/tools/ocaml/camlp4 { }
|
||||||
else null;
|
else null;
|
||||||
|
|
||||||
camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
|
camlp5 = callPackage ../development/tools/ocaml/camlp5 { };
|
||||||
|
|
||||||
camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {
|
# Compatibility alias
|
||||||
transitional = true;
|
camlp5_strict = camlp5;
|
||||||
};
|
|
||||||
|
|
||||||
camlp5_strict = camlp5_6_strict;
|
|
||||||
|
|
||||||
camlp5_transitional = camlp5_6_transitional;
|
|
||||||
|
|
||||||
camlpdf = callPackage ../development/ocaml-modules/camlpdf { };
|
camlpdf = callPackage ../development/ocaml-modules/camlpdf { };
|
||||||
|
|
||||||
@ -592,10 +587,6 @@ let
|
|||||||
|
|
||||||
ulex = callPackage ../development/ocaml-modules/ulex { };
|
ulex = callPackage ../development/ocaml-modules/ulex { };
|
||||||
|
|
||||||
ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
|
|
||||||
camlp5 = camlp5_transitional;
|
|
||||||
};
|
|
||||||
|
|
||||||
textutils_p4 = callPackage ../development/ocaml-modules/textutils { };
|
textutils_p4 = callPackage ../development/ocaml-modules/textutils { };
|
||||||
|
|
||||||
tls = callPackage ../development/ocaml-modules/tls {
|
tls = callPackage ../development/ocaml-modules/tls {
|
||||||
@ -1046,10 +1037,7 @@ let
|
|||||||
enableX11 = config.unison.enableX11 or true;
|
enableX11 = config.unison.enableX11 or true;
|
||||||
};
|
};
|
||||||
|
|
||||||
hol_light = callPackage ../applications/science/logic/hol_light {
|
hol_light = callPackage ../applications/science/logic/hol_light { };
|
||||||
inherit num;
|
|
||||||
camlp5 = camlp5_strict;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
in (ocamlPackages.janeStreet // ocamlPackages);
|
in (ocamlPackages.janeStreet // ocamlPackages);
|
||||||
|
Loading…
Reference in New Issue
Block a user