forked from mirrors/nixpkgs
Weijia Wang
GitHub
commit
293e39ec09
|
|
@ -1,82 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, which, perl, jdk
|
||||
, ocamlPackages, openssl
|
||||
, coreutils, zlib, ncurses, makeWrapper
|
||||
, gcc, binutils, gnumake, nodejs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opa";
|
||||
version = "4310";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MLstate";
|
||||
repo = "opalang";
|
||||
rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5";
|
||||
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./ocaml-4.03.patch
|
||||
./ocaml-4.04.patch
|
||||
./ocaml-4.14.patch
|
||||
./ocaml-4.14-tags.patch
|
||||
];
|
||||
|
||||
# Paths so the opa compiler code generation will use the same programs as were
|
||||
# used to build opa.
|
||||
codeGeneratorPaths = lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
(
|
||||
cat ./compiler/buildinfos/buildInfos.ml.pre
|
||||
./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
|
||||
echo let opa_git_version = ${version}
|
||||
echo 'let opa_git_sha = "xxxx"'
|
||||
cat ./compiler/buildinfos/buildInfos.ml.post
|
||||
)> ./compiler/buildinfos/buildInfos.ml
|
||||
for p in configure tools/platform_helper.sh
|
||||
do
|
||||
substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1'
|
||||
done
|
||||
export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o
|
||||
export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf
|
||||
export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild
|
||||
'';
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
|
||||
|
||||
nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ];
|
||||
buildInputs = [ perl jdk openssl coreutils zlib ncurses
|
||||
] ++ (with ocamlPackages; [
|
||||
ocaml findlib ssl camlzip ulex ocamlgraph camlp4 num
|
||||
]);
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
|
||||
postInstall = ''
|
||||
# Have compiler use same tools for code generation as used to build it.
|
||||
for p in $out/bin/opa ; do
|
||||
wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ;
|
||||
done
|
||||
|
||||
# Install emacs mode.
|
||||
mkdir -p $out/share/emacs/site-lisp/opa
|
||||
install -m 0644 -v ./tools/editors/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A concise and elegant language for writing distributed web applications";
|
||||
longDescription = ''
|
||||
Opa is a new generation of web development platform that lets you write distributed
|
||||
web applications using a single technology. Among the the many features of Opa are these:
|
||||
Opa is concise, simple, concurrent, dynamically distributed, and secure.
|
||||
'';
|
||||
homepage = "http://opalang.org/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
--- a/compiler/passes/surfaceAstRenaming.ml
|
||||
+++ b/compiler/passes/surfaceAstRenaming.ml
|
||||
@@ -1110,7 +1110,7 @@ let find_opt_local_or_global name all_env =
|
||||
| None -> find_opt_global name all_env
|
||||
| v -> v
|
||||
|
||||
-let path_expr_to_module_aux p = function
|
||||
+let path_expr_to_module_aux p : _ -> _ result = function
|
||||
| Some (OpenedIdent (tree, ident, path)) ->
|
||||
(match Tree.get_path_opt tree p with
|
||||
(* the path is not in the tree, which means a 'dot' access
|
||||
diff --git a/ocamllib/libbase/baseInt64.mli b/ocamllib/libbase/baseInt64.mli
|
||||
index fb544706..734437f9 100644
|
||||
--- a/ocamllib/libbase/baseInt64.mli
|
||||
+++ b/ocamllib/libbase/baseInt64.mli
|
||||
@@ -40,7 +40,9 @@ external shift_right_logical : int64 -> int -> int64 = "%int64_lsr"
|
||||
external of_int : int -> int64 = "%int64_of_int"
|
||||
external to_int : int64 -> int = "%int64_to_int"
|
||||
external of_float : float -> int64 = "caml_int64_of_float"
|
||||
+ "caml_int64_of_float_unboxed" [@@unboxed] [@@noalloc]
|
||||
external to_float : int64 -> float = "caml_int64_to_float"
|
||||
+ "caml_int64_to_float_unboxed" [@@unboxed] [@@noalloc]
|
||||
external of_int32 : int32 -> int64 = "%int64_of_int32"
|
||||
external to_int32 : int64 -> int32 = "%int64_to_int32"
|
||||
external of_nativeint : nativeint -> int64 = "%int64_of_nativeint"
|
||||
@@ -48,7 +50,9 @@ external to_nativeint : int64 -> nativeint = "%int64_to_nativeint"
|
||||
external of_string : string -> int64 = "caml_int64_of_string"
|
||||
val to_string : int64 -> string
|
||||
external bits_of_float : float -> int64 = "caml_int64_bits_of_float"
|
||||
+ "caml_int64_bits_of_float_unboxed" [@@unboxed] [@@noalloc]
|
||||
external float_of_bits : int64 -> float = "caml_int64_float_of_bits"
|
||||
+ "caml_int64_float_of_bits_unboxed" [@@unboxed] [@@noalloc]
|
||||
type t = int64
|
||||
val compare : t -> t -> int
|
||||
external format : string -> int64 -> string = "caml_int64_format"
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml
|
||||
index b9f75bd1..171af065 100644
|
||||
--- a/compiler/libbsl/bslLib.ml
|
||||
+++ b/compiler/libbsl/bslLib.ml
|
||||
@@ -726,7 +726,7 @@ struct
|
||||
let root elt = !(elt.root)
|
||||
let elt_name elt = elt.name
|
||||
let elts e = e
|
||||
- let children = List.map (fun e -> e.name, e)
|
||||
+ let children m = List.map (fun e -> e.name, e) m
|
||||
let is_root e = Path.is_root e.pwd
|
||||
|
||||
let parent e =
|
||||
diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml
|
||||
index f4354a3f..81253d32 100644
|
||||
--- a/compiler/passes/surfaceAstDependencies.ml
|
||||
+++ b/compiler/passes/surfaceAstDependencies.ml
|
||||
@@ -66,7 +66,6 @@ open SurfaceAst
|
||||
|
||||
(* shorthands *)
|
||||
module SAH = SurfaceAstHelper
|
||||
-module C = SurfaceAstCons.ExprIdentCons
|
||||
module D = SurfaceAstDecons
|
||||
module S = SurfaceAst
|
||||
|
||||
diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml
|
||||
index 10edf5cb..00de59fa 100644
|
||||
--- a/compiler/passes/surfaceAstPasses.ml
|
||||
+++ b/compiler/passes/surfaceAstPasses.ml
|
||||
@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes
|
||||
|
||||
(* alias *)
|
||||
module C = SurfaceAstCons.ExprIdentCons
|
||||
-module CS = SurfaceAstCons.StringCons
|
||||
|
||||
|
||||
|
||||
diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
index 2eebd96b..04ce77c8 100644
|
||||
--- a/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
+++ b/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
@@ -17,7 +17,6 @@
|
||||
*)
|
||||
module Format = Base.Format
|
||||
module List = Base.List
|
||||
-module String = Base.String
|
||||
module Q = QmlAst
|
||||
module Package = ObjectFiles.Package
|
||||
|
||||
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
|
||||
index da2d9736..82d72963 100644
|
||||
--- a/ocamllib/libbase/baseObj.mli
|
||||
+++ b/ocamllib/libbase/baseObj.mli
|
||||
@@ -21,7 +21,7 @@ type t = Obj.t
|
||||
external repr : 'a -> t = "%identity"
|
||||
external obj : t -> 'a = "%identity"
|
||||
external magic : 'a -> 'b = "%identity"
|
||||
-external is_block : t -> bool = "caml_obj_is_block"
|
||||
+val [@inline always] is_block : t -> bool
|
||||
external is_int : t -> bool = "%obj_is_int"
|
||||
external tag : t -> int = "caml_obj_tag"
|
||||
external set_tag : t -> int -> unit = "caml_obj_set_tag"
|
||||
diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml
|
||||
index 640ce2fa..6931c608 100644
|
||||
--- a/ocamllib/libbase/baseString.ml
|
||||
+++ b/ocamllib/libbase/baseString.ml
|
||||
@@ -20,7 +20,7 @@
|
||||
(* depends *)
|
||||
module Char = BaseChar
|
||||
|
||||
-include Bytes
|
||||
+include String
|
||||
|
||||
let compare_int (a:int) b = Pervasives.compare a b
|
||||
|
||||
|
|
@ -1,191 +0,0 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 37589e1..10d3418 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -14,6 +14,7 @@ OPALANG_DIR ?= .
|
||||
|
||||
MAKE ?= $_
|
||||
OCAMLBUILD_OPT ?= -j 6
|
||||
+OCAMLBUILD_OPT += -use-ocamlfind -package num
|
||||
|
||||
ifndef NO_REBUILD_OPA_PACKAGES
|
||||
OPAOPT += --rebuild
|
||||
diff --git a/_tags b/_tags
|
||||
index 5d8d922..b6bdd5e 100644
|
||||
--- a/_tags
|
||||
+++ b/_tags
|
||||
@@ -15,4 +15,4 @@
|
||||
<{ocamllib,compiler,lib,tools}>: include
|
||||
|
||||
# Warnings
|
||||
-<**/*.ml>: warn_L, warn_Z, warn_error_A
|
||||
+<**/*.ml>: warn_L, warn_Z
|
||||
diff --git a/compiler/_tags b/compiler/_tags
|
||||
index b33eeeb..7afa493 100644
|
||||
--- a/compiler/_tags
|
||||
+++ b/compiler/_tags
|
||||
@@ -7,6 +7,6 @@
|
||||
|
||||
<main.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_passlib, use_libbsl, use_qmloptions, use_qml2js, use_js_passes, use_opa
|
||||
|
||||
-<main.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_js_passes, use_opa
|
||||
+<main.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_js_passes, use_opa
|
||||
|
||||
<main.ml>: with_mlstate_debug
|
||||
diff --git a/compiler/jslang/_tags b/compiler/jslang/_tags
|
||||
index f33b592..8925703 100644
|
||||
--- a/compiler/jslang/_tags
|
||||
+++ b/compiler/jslang/_tags
|
||||
@@ -4,7 +4,7 @@
|
||||
<jsParse.ml>: use_camlp4, camlp4orf_fixed
|
||||
|
||||
# todo: find a way to link fewer libs
|
||||
-<{jspp,jsstat,globalizer}.{byte,native}>: use_passlib, use_opacapi, use_libtrx, use_ulex, use_str, use_unix, use_buildinfos, use_libbase, use_libqmlcompil, use_compilerlib, use_graph, use_nums, use_dynlink, use_jslang, use_ocamllang, use_libbsl, use_opalang, use_pplib, use_qmloptions, use_qml2js, use_qmlcpsrewriter, use_qmlpasses
|
||||
+<{jspp,jsstat,globalizer}.{byte,native}>: use_passlib, use_opacapi, use_libtrx, use_ulex, use_str, use_unix, use_buildinfos, use_libbase, use_libqmlcompil, use_compilerlib, use_graph, use_dynlink, use_jslang, use_ocamllang, use_libbsl, use_opalang, use_pplib, use_qmloptions, use_qml2js, use_qmlcpsrewriter, use_qmlpasses
|
||||
<{jspp,jsstat,globalizer}.{ml,byte,native}>: use_qmljsimp
|
||||
|
||||
<jsstat.{ml,byte,native}>: use_libjsminify
|
||||
diff --git a/compiler/libbsl/_tags b/compiler/libbsl/_tags
|
||||
index cad1fe4..8ef238b 100644
|
||||
--- a/compiler/libbsl/_tags
|
||||
+++ b/compiler/libbsl/_tags
|
||||
@@ -20,7 +20,7 @@
|
||||
<bslRegisterParser.{ml,mli,byte,native}>: use_libtrx
|
||||
<bslTinyShell.{ml,mli,byte,native}>: use_libtrx
|
||||
<bslregister.*>: use_jslang
|
||||
-<bslregister.{byte,native}>: use_ulex, use_libbsl, use_dynlink, use_zip, use_nums
|
||||
+<bslregister.{byte,native}>: use_ulex, use_libbsl, use_dynlink, use_zip
|
||||
<portingBsl.{ml,byte,native}>: use_ulex, use_libbsl, use_dynlink, use_zip, use_nums
|
||||
<bslGeneration.{ml,mli}>: use_ulex, use_dynlink, use_zip, use_nums, use_jslang
|
||||
<bslMarshalPlugin.*>: use_jslang
|
||||
@@ -30,7 +30,7 @@
|
||||
<tests>: ignore
|
||||
|
||||
# applications, linking
|
||||
-<*.{byte,native}>:use_buildinfos, use_ulex, use_libtrx, use_dynlink, use_unix, thread, use_graph, use_libbsl, use_passlib, use_zip, use_nums, use_opalang, use_ocamllang, use_langlang, use_jslang, use_opacapi
|
||||
+<*.{byte,native}>:use_buildinfos, use_ulex, use_libtrx, use_dynlink, thread, use_graph, use_libbsl, use_passlib, use_zip, use_opalang, use_ocamllang, use_langlang, use_jslang, use_opacapi
|
||||
|
||||
# ppdebug (pl. be very specific with the use of ppdebug)
|
||||
<bslLib.ml*> : with_mlstate_debug
|
||||
diff --git a/compiler/opa/_tags b/compiler/opa/_tags
|
||||
index cfe97a1..702af34 100644
|
||||
--- a/compiler/opa/_tags
|
||||
+++ b/compiler/opa/_tags
|
||||
@@ -62,7 +62,7 @@
|
||||
<syntaxHelper.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_passlib
|
||||
|
||||
# linking
|
||||
-<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_qmloptions
|
||||
+<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_qmloptions
|
||||
|
||||
<opa_InsertRemote.ml>: with_mlstate_debug
|
||||
<main_utils.ml>: with_mlstate_debug
|
||||
diff --git a/compiler/opalang/_tags b/compiler/opalang/_tags
|
||||
index 6844281..8f0eaec 100644
|
||||
--- a/compiler/opalang/_tags
|
||||
+++ b/compiler/opalang/_tags
|
||||
@@ -14,7 +14,7 @@ true: warn_Z
|
||||
<standaloneparser.ml>: use_buildinfos, use_compilerlib, use_pplib
|
||||
<**/*.{ml,mli}>: use_libbase, use_compilerlib, use_libqmlcompil, use_passlib
|
||||
|
||||
-<{opa2opa,standaloneparser}.{native,byte}>: use_unix, use_libbase, use_mutex, use_graph, use_str, use_zlib, thread, use_nums, use_libtrx, use_passlib, use_libqmlcompil, use_buildinfos, use_ulex, use_compilerlib, use_pplib, use_opacapi
|
||||
+<{opa2opa,standaloneparser}.{native,byte}>: use_libbase, use_mutex, use_graph, use_str, use_zlib, thread, use_libtrx, use_passlib, use_libqmlcompil, use_buildinfos, use_ulex, use_compilerlib, use_pplib, use_opacapi
|
||||
|
||||
<opaMapToIdent.ml>: use_opacapi
|
||||
<surfaceAstCons.ml>: use_opacapi
|
||||
diff --git a/compiler/opx2js/_tags b/compiler/opx2js/_tags
|
||||
index 7e9b9cc..3e257ea 100644
|
||||
--- a/compiler/opx2js/_tags
|
||||
+++ b/compiler/opx2js/_tags
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<**/*.{ml,mli}>: use_buildinfos, use_libbase, use_compilerlib, use_passlib
|
||||
|
||||
-<**/*.native>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_libopa
|
||||
+<**/*.native>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_libopa
|
||||
|
||||
<**/opx2jsPasses.{ml,mli}>: use_jslang, use_opalib, use_opalang, use_opapasses, use_libopa, use_libqmlcompil, use_qmlpasses, use_qmlcpsrewriter, use_qmlslicer
|
||||
|
||||
diff --git a/compiler/passes/_tags b/compiler/passes/_tags
|
||||
index a0daff4..9644d3a 100644
|
||||
--- a/compiler/passes/_tags
|
||||
+++ b/compiler/passes/_tags
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- conf -*- (for emacs)
|
||||
|
||||
# preprocessing
|
||||
-true: with_mlstate_debug, warn_A, warn_e, warn_error_A, warnno_48
|
||||
+true: with_mlstate_debug, warn_A, warn_e, warnno_48
|
||||
|
||||
<**/*.{ml,mli}>: use_libbase, use_libqmlcompil, use_passlib, use_opalang, use_compilerlib, use_opacapi
|
||||
<surfaceAst*.{ml,mli}>: use_opalib, use_libbsl
|
||||
diff --git a/compiler/passlib/_tags b/compiler/passlib/_tags
|
||||
index 2b9cfcf..5cb3145 100644
|
||||
--- a/compiler/passlib/_tags
|
||||
+++ b/compiler/passlib/_tags
|
||||
@@ -1,6 +1,6 @@
|
||||
# -*- conf -*- (for emacs)
|
||||
|
||||
-<*.{ml,mli,byte,native}>: use_libbase, use_compilerlib, thread, use_ulex, use_unix, use_str
|
||||
+<*.{ml,mli,byte,native}>: use_libbase, use_compilerlib, thread, use_ulex, use_str
|
||||
|
||||
<passHandler.ml>: use_buildinfos
|
||||
<passdesign.{byte,native}>: use_buildinfos, use_graph
|
||||
diff --git a/compiler/qmlcompilers/_tags b/compiler/qmlcompilers/_tags
|
||||
index 087165c..87ae918 100644
|
||||
--- a/compiler/qmlcompilers/_tags
|
||||
+++ b/compiler/qmlcompilers/_tags
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
# application, linkink
|
||||
# common
|
||||
-<{qmljs_exe}.{ml,mli,byte,native}>: thread, use_unix, use_dynlink, use_str, use_graph, use_ulex, use_libtrx, use_pplib, use_opabsl_for_compiler, use_passlib, use_nums, use_buildinfos, use_opalang, use_compilerlib, use_opacapi
|
||||
+<{qmljs_exe}.{ml,mli,byte,native}>: thread, use_dynlink, use_str, use_graph, use_ulex, use_libtrx, use_pplib, use_opabsl_for_compiler, use_passlib, use_buildinfos, use_opalang, use_compilerlib, use_opacapi
|
||||
|
||||
# specific
|
||||
<qmljs_exe.{ml,byte,native}>: use_qmljsimp, use_qml2js, use_zip
|
||||
diff --git a/ocamllib/libbase/_tags b/ocamllib/libbase/_tags
|
||||
index 42d067d..6b7e690 100644
|
||||
--- a/ocamllib/libbase/_tags
|
||||
+++ b/ocamllib/libbase/_tags
|
||||
@@ -27,4 +27,4 @@
|
||||
<mongo.ml>: with_mlstate_debug
|
||||
|
||||
|
||||
-<{testconsole,testfilepos}.{ml,mli,byte,native}>: thread, use_str, use_unix, use_libbase, use_ulex
|
||||
+<{testconsole,testfilepos}.{ml,mli,byte,native}>: thread, use_str, use_libbase, use_ulex
|
||||
diff --git a/tools/_tags b/tools/_tags
|
||||
index 549752b..44c97b3 100644
|
||||
--- a/tools/_tags
|
||||
+++ b/tools/_tags
|
||||
@@ -8,7 +8,7 @@
|
||||
<build>: include
|
||||
|
||||
# Odep
|
||||
-<odep*.{ml,byte,native}>: thread, use_str, use_unix, use_graph, use_zip, use_libbase, use_ulex
|
||||
+<odep*.{ml,byte,native}>: thread, use_str, use_graph, use_zip, use_libbase, use_ulex
|
||||
|
||||
###
|
||||
# Ofile
|
||||
@@ -16,7 +16,7 @@
|
||||
<ofile.ml>: use_libbase
|
||||
|
||||
# linking
|
||||
-<ofile.{byte,native}>: use_unix, use_str, thread, use_ulex, use_libbase, use_zip
|
||||
+<ofile.{byte,native}>: use_str, thread, use_ulex, use_libbase, use_zip
|
||||
|
||||
###
|
||||
# jschecker
|
||||
diff --git a/tools/teerex/_tags b/tools/teerex/_tags
|
||||
index d662b49..366ea01 100644
|
||||
--- a/tools/teerex/_tags
|
||||
+++ b/tools/teerex/_tags
|
||||
@@ -6,6 +6,6 @@
|
||||
|
||||
<*.{ml,mli,byte,native}>: use_str, use_libbase, use_compilerlib, use_graph, use_libtrx, use_ocamllang, use_zip, use_buildinfos, use_passlib
|
||||
|
||||
-<trx_ocaml.{byte,native}>: thread, use_unix
|
||||
+<trx_ocaml.{byte,native}>: thread
|
||||
<trx_ocaml_main.{byte,native}>: thread, use_unix
|
||||
-<trx_interpreter.{byte,native}>: thread, use_unix
|
||||
+<trx_interpreter.{byte,native}>: thread
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
diff --git a/compiler/compilerlib/objectFiles.ml b/compiler/compilerlib/objectFiles.ml
|
||||
index d0e7223..5fee601 100644
|
||||
--- a/compiler/compilerlib/objectFiles.ml
|
||||
+++ b/compiler/compilerlib/objectFiles.ml
|
||||
@@ -339,8 +339,9 @@ let dirname (package:package_name) : filename = Filename.concat !opxdir (unprefi
|
||||
let unprefixed_dirname_plugin (package:package_name) : filename = package ^ "." ^ Name.plugin_ext
|
||||
let dirname_plugin (package:package_name) : filename = Filename.concat !opxdir (unprefixed_dirname_plugin package)
|
||||
let dirname_from_package ((package_name,_):package) = dirname package_name
|
||||
-let undirname filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.object_ext)
|
||||
-let undirname_plugin filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.plugin_ext)
|
||||
+let chop_suffix name suff = try Filename.chop_suffix name suff with _ -> name
|
||||
+let undirname filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.object_ext)
|
||||
+let undirname_plugin filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.plugin_ext)
|
||||
let filename_from_dir dir pass = Filename.concat dir pass
|
||||
let filename_from_package package pass = filename_from_dir (dirname_from_package package) pass
|
||||
|
||||
diff --git a/ocamllib/libbase/baseHashtbl.ml b/ocamllib/libbase/baseHashtbl.ml
|
||||
index 439d76c..7be6cf9 100644
|
||||
--- a/ocamllib/libbase/baseHashtbl.ml
|
||||
+++ b/ocamllib/libbase/baseHashtbl.ml
|
||||
@@ -29,7 +29,6 @@ let iter = Hashtbl.iter
|
||||
let fold = Hashtbl.fold
|
||||
let length = Hashtbl.length
|
||||
let hash = Hashtbl.hash
|
||||
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
|
||||
module type HashedType = Hashtbl.HashedType
|
||||
|
||||
(* could be done (with magic) more efficiently
|
||||
diff --git a/ocamllib/libbase/baseHashtbl.mli b/ocamllib/libbase/baseHashtbl.mli
|
||||
index 1a2b146..10e448b 100644
|
||||
--- a/ocamllib/libbase/baseHashtbl.mli
|
||||
+++ b/ocamllib/libbase/baseHashtbl.mli
|
||||
@@ -41,7 +41,6 @@ end
|
||||
module Make (H : HashedType) : S with type key = H.t
|
||||
|
||||
val hash : 'a -> int
|
||||
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
|
||||
|
||||
(**
|
||||
additional functions
|
||||
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
|
||||
index da2d973..5eb77b5 100644
|
||||
--- a/ocamllib/libbase/baseObj.mli
|
||||
+++ b/ocamllib/libbase/baseObj.mli
|
||||
@@ -23,7 +23,7 @@ external obj : t -> 'a = "%identity"
|
||||
external magic : 'a -> 'b = "%identity"
|
||||
external is_block : t -> bool = "caml_obj_is_block"
|
||||
external is_int : t -> bool = "%obj_is_int"
|
||||
-external tag : t -> int = "caml_obj_tag"
|
||||
+external tag : t -> int = "caml_obj_tag" [@@noalloc]
|
||||
external set_tag : t -> int -> unit = "caml_obj_set_tag"
|
||||
external size : t -> int = "%obj_size"
|
||||
external truncate : t -> int -> unit = "caml_obj_truncate"
|
||||
@@ -49,9 +49,6 @@ val int_tag : int
|
||||
val out_of_heap_tag : int
|
||||
val unaligned_tag : int
|
||||
|
||||
-val marshal : t -> string
|
||||
-val unmarshal : string -> int -> t * int
|
||||
-
|
||||
(** Additional functions *)
|
||||
|
||||
val dump : ?custom:(Obj.t -> (Buffer.t -> Obj.t -> unit) option) -> ?depth:int -> 'a -> string
|
||||
|
|
@ -1104,6 +1104,7 @@ mapAliases ({
|
|||
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
|
||||
ofp = throw "ofp is not compatible with odp-dpdk";
|
||||
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
|
||||
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
|
||||
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
|
||||
openafs_1_8 = openafs; # Added 2022-08-22
|
||||
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
|
||||
|
|
|
|||
|
|
@ -15648,10 +15648,6 @@ with pkgs;
|
|||
|
||||
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
|
||||
|
||||
opa = callPackage ../development/compilers/opa {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
|
||||
};
|
||||
|
||||
opaline = callPackage ../development/tools/ocaml/opaline { };
|
||||
|
||||
opam = callPackage ../development/tools/ocaml/opam {
|
||||
|
|
|
|||
Loading…
Reference in a new issue