pyrox.dev
Merge pull request #222368 from wegank/opa-drop
opa: drop
authored by Weijia Wang and committed by GitHub 293e39ec a0ffb1f4
-82
pkgs/development/compilers/opa/default.nix
-82
pkgs/development/compilers/opa/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, which, perl, jdk
2
-
, ocamlPackages, openssl
3
-
, coreutils, zlib, ncurses, makeWrapper
4
-
, gcc, binutils, gnumake, nodejs
5
-
}:
6
-
7
-
stdenv.mkDerivation rec {
8
-
pname = "opa";
9
-
version = "4310";
10
-
11
-
src = fetchFromGitHub {
12
-
owner = "MLstate";
13
-
repo = "opalang";
14
-
rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5";
15
-
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
16
-
};
17
-
18
-
patches = [
19
-
./ocaml-4.03.patch
20
-
./ocaml-4.04.patch
21
-
./ocaml-4.14.patch
22
-
./ocaml-4.14-tags.patch
23
-
];
24
-
25
-
# Paths so the opa compiler code generation will use the same programs as were
26
-
# used to build opa.
27
-
codeGeneratorPaths = lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
28
-
29
-
preConfigure = ''
30
-
patchShebangs .
31
-
(
32
-
cat ./compiler/buildinfos/buildInfos.ml.pre
33
-
./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
34
-
echo let opa_git_version = ${version}
35
-
echo 'let opa_git_sha = "xxxx"'
36
-
cat ./compiler/buildinfos/buildInfos.ml.post
37
-
)> ./compiler/buildinfos/buildInfos.ml
38
-
for p in configure tools/platform_helper.sh
39
-
do
40
-
substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1'
41
-
done
42
-
export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o
43
-
export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf
44
-
export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild
45
-
'';
46
-
47
-
prefixKey = "-prefix ";
48
-
49
-
configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ];
50
-
51
-
nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ];
52
-
buildInputs = [ perl jdk openssl coreutils zlib ncurses
53
-
] ++ (with ocamlPackages; [
54
-
ocaml findlib ssl camlzip ulex ocamlgraph camlp4 num
55
-
]);
56
-
57
-
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
58
-
59
-
postInstall = ''
60
-
# Have compiler use same tools for code generation as used to build it.
61
-
for p in $out/bin/opa ; do
62
-
wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ;
63
-
done
64
-
65
-
# Install emacs mode.
66
-
mkdir -p $out/share/emacs/site-lisp/opa
67
-
install -m 0644 -v ./tools/editors/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
68
-
'';
69
-
70
-
meta = {
71
-
description = "A concise and elegant language for writing distributed web applications";
72
-
longDescription = ''
73
-
Opa is a new generation of web development platform that lets you write distributed
74
-
web applications using a single technology. Among the the many features of Opa are these:
75
-
Opa is concise, simple, concurrent, dynamically distributed, and secure.
76
-
'';
77
-
homepage = "http://opalang.org/";
78
-
license = lib.licenses.gpl3;
79
-
maintainers = [ ];
80
-
platforms = [ "x86_64-linux" "x86_64-darwin" ];
81
-
};
82
-
}
···
-35
pkgs/development/compilers/opa/ocaml-4.03.patch
-35
pkgs/development/compilers/opa/ocaml-4.03.patch
···
1
-
--- a/compiler/passes/surfaceAstRenaming.ml
2
-
+++ b/compiler/passes/surfaceAstRenaming.ml
3
-
@@ -1110,7 +1110,7 @@ let find_opt_local_or_global name all_env =
4
-
| None -> find_opt_global name all_env
5
-
| v -> v
6
-
7
-
-let path_expr_to_module_aux p = function
8
-
+let path_expr_to_module_aux p : _ -> _ result = function
9
-
| Some (OpenedIdent (tree, ident, path)) ->
10
-
(match Tree.get_path_opt tree p with
11
-
(* the path is not in the tree, which means a 'dot' access
12
-
diff --git a/ocamllib/libbase/baseInt64.mli b/ocamllib/libbase/baseInt64.mli
13
-
index fb544706..734437f9 100644
14
-
--- a/ocamllib/libbase/baseInt64.mli
15
-
+++ b/ocamllib/libbase/baseInt64.mli
16
-
@@ -40,7 +40,9 @@ external shift_right_logical : int64 -> int -> int64 = "%int64_lsr"
17
-
external of_int : int -> int64 = "%int64_of_int"
18
-
external to_int : int64 -> int = "%int64_to_int"
19
-
external of_float : float -> int64 = "caml_int64_of_float"
20
-
+ "caml_int64_of_float_unboxed" [@@unboxed] [@@noalloc]
21
-
external to_float : int64 -> float = "caml_int64_to_float"
22
-
+ "caml_int64_to_float_unboxed" [@@unboxed] [@@noalloc]
23
-
external of_int32 : int32 -> int64 = "%int64_of_int32"
24
-
external to_int32 : int64 -> int32 = "%int64_to_int32"
25
-
external of_nativeint : nativeint -> int64 = "%int64_of_nativeint"
26
-
@@ -48,7 +50,9 @@ external to_nativeint : int64 -> nativeint = "%int64_to_nativeint"
27
-
external of_string : string -> int64 = "caml_int64_of_string"
28
-
val to_string : int64 -> string
29
-
external bits_of_float : float -> int64 = "caml_int64_bits_of_float"
30
-
+ "caml_int64_bits_of_float_unboxed" [@@unboxed] [@@noalloc]
31
-
external float_of_bits : int64 -> float = "caml_int64_float_of_bits"
32
-
+ "caml_int64_float_of_bits_unboxed" [@@unboxed] [@@noalloc]
33
-
type t = int64
34
-
val compare : t -> t -> int
35
-
external format : string -> int64 -> string = "caml_int64_format"
···
-75
pkgs/development/compilers/opa/ocaml-4.04.patch
-75
pkgs/development/compilers/opa/ocaml-4.04.patch
···
1
-
diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml
2
-
index b9f75bd1..171af065 100644
3
-
--- a/compiler/libbsl/bslLib.ml
4
-
+++ b/compiler/libbsl/bslLib.ml
5
-
@@ -726,7 +726,7 @@ struct
6
-
let root elt = !(elt.root)
7
-
let elt_name elt = elt.name
8
-
let elts e = e
9
-
- let children = List.map (fun e -> e.name, e)
10
-
+ let children m = List.map (fun e -> e.name, e) m
11
-
let is_root e = Path.is_root e.pwd
12
-
13
-
let parent e =
14
-
diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml
15
-
index f4354a3f..81253d32 100644
16
-
--- a/compiler/passes/surfaceAstDependencies.ml
17
-
+++ b/compiler/passes/surfaceAstDependencies.ml
18
-
@@ -66,7 +66,6 @@ open SurfaceAst
19
-
20
-
(* shorthands *)
21
-
module SAH = SurfaceAstHelper
22
-
-module C = SurfaceAstCons.ExprIdentCons
23
-
module D = SurfaceAstDecons
24
-
module S = SurfaceAst
25
-
26
-
diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml
27
-
index 10edf5cb..00de59fa 100644
28
-
--- a/compiler/passes/surfaceAstPasses.ml
29
-
+++ b/compiler/passes/surfaceAstPasses.ml
30
-
@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes
31
-
32
-
(* alias *)
33
-
module C = SurfaceAstCons.ExprIdentCons
34
-
-module CS = SurfaceAstCons.StringCons
35
-
36
-
37
-
38
-
diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml
39
-
index 2eebd96b..04ce77c8 100644
40
-
--- a/compiler/qmlslicer/qmlSimpleSlicer.ml
41
-
+++ b/compiler/qmlslicer/qmlSimpleSlicer.ml
42
-
@@ -17,7 +17,6 @@
43
-
*)
44
-
module Format = Base.Format
45
-
module List = Base.List
46
-
-module String = Base.String
47
-
module Q = QmlAst
48
-
module Package = ObjectFiles.Package
49
-
50
-
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
51
-
index da2d9736..82d72963 100644
52
-
--- a/ocamllib/libbase/baseObj.mli
53
-
+++ b/ocamllib/libbase/baseObj.mli
54
-
@@ -21,7 +21,7 @@ type t = Obj.t
55
-
external repr : 'a -> t = "%identity"
56
-
external obj : t -> 'a = "%identity"
57
-
external magic : 'a -> 'b = "%identity"
58
-
-external is_block : t -> bool = "caml_obj_is_block"
59
-
+val [@inline always] is_block : t -> bool
60
-
external is_int : t -> bool = "%obj_is_int"
61
-
external tag : t -> int = "caml_obj_tag"
62
-
external set_tag : t -> int -> unit = "caml_obj_set_tag"
63
-
diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml
64
-
index 640ce2fa..6931c608 100644
65
-
--- a/ocamllib/libbase/baseString.ml
66
-
+++ b/ocamllib/libbase/baseString.ml
67
-
@@ -20,7 +20,7 @@
68
-
(* depends *)
69
-
module Char = BaseChar
70
-
71
-
-include Bytes
72
-
+include String
73
-
74
-
let compare_int (a:int) b = Pervasives.compare a b
75
-
···
-63
pkgs/development/compilers/opa/ocaml-4.14.patch
-63
pkgs/development/compilers/opa/ocaml-4.14.patch
···
1
-
diff --git a/compiler/compilerlib/objectFiles.ml b/compiler/compilerlib/objectFiles.ml
2
-
index d0e7223..5fee601 100644
3
-
--- a/compiler/compilerlib/objectFiles.ml
4
-
+++ b/compiler/compilerlib/objectFiles.ml
5
-
@@ -339,8 +339,9 @@ let dirname (package:package_name) : filename = Filename.concat !opxdir (unprefi
6
-
let unprefixed_dirname_plugin (package:package_name) : filename = package ^ "." ^ Name.plugin_ext
7
-
let dirname_plugin (package:package_name) : filename = Filename.concat !opxdir (unprefixed_dirname_plugin package)
8
-
let dirname_from_package ((package_name,_):package) = dirname package_name
9
-
-let undirname filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.object_ext)
10
-
-let undirname_plugin filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.plugin_ext)
11
-
+let chop_suffix name suff = try Filename.chop_suffix name suff with _ -> name
12
-
+let undirname filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.object_ext)
13
-
+let undirname_plugin filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.plugin_ext)
14
-
let filename_from_dir dir pass = Filename.concat dir pass
15
-
let filename_from_package package pass = filename_from_dir (dirname_from_package package) pass
16
-
17
-
diff --git a/ocamllib/libbase/baseHashtbl.ml b/ocamllib/libbase/baseHashtbl.ml
18
-
index 439d76c..7be6cf9 100644
19
-
--- a/ocamllib/libbase/baseHashtbl.ml
20
-
+++ b/ocamllib/libbase/baseHashtbl.ml
21
-
@@ -29,7 +29,6 @@ let iter = Hashtbl.iter
22
-
let fold = Hashtbl.fold
23
-
let length = Hashtbl.length
24
-
let hash = Hashtbl.hash
25
-
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
26
-
module type HashedType = Hashtbl.HashedType
27
-
28
-
(* could be done (with magic) more efficiently
29
-
diff --git a/ocamllib/libbase/baseHashtbl.mli b/ocamllib/libbase/baseHashtbl.mli
30
-
index 1a2b146..10e448b 100644
31
-
--- a/ocamllib/libbase/baseHashtbl.mli
32
-
+++ b/ocamllib/libbase/baseHashtbl.mli
33
-
@@ -41,7 +41,6 @@ end
34
-
module Make (H : HashedType) : S with type key = H.t
35
-
36
-
val hash : 'a -> int
37
-
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
38
-
39
-
(**
40
-
additional functions
41
-
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
42
-
index da2d973..5eb77b5 100644
43
-
--- a/ocamllib/libbase/baseObj.mli
44
-
+++ b/ocamllib/libbase/baseObj.mli
45
-
@@ -23,7 +23,7 @@ external obj : t -> 'a = "%identity"
46
-
external magic : 'a -> 'b = "%identity"
47
-
external is_block : t -> bool = "caml_obj_is_block"
48
-
external is_int : t -> bool = "%obj_is_int"
49
-
-external tag : t -> int = "caml_obj_tag"
50
-
+external tag : t -> int = "caml_obj_tag" [@@noalloc]
51
-
external set_tag : t -> int -> unit = "caml_obj_set_tag"
52
-
external size : t -> int = "%obj_size"
53
-
external truncate : t -> int -> unit = "caml_obj_truncate"
54
-
@@ -49,9 +49,6 @@ val int_tag : int
55
-
val out_of_heap_tag : int
56
-
val unaligned_tag : int
57
-
58
-
-val marshal : t -> string
59
-
-val unmarshal : string -> int -> t * int
60
-
-
61
-
(** Additional functions *)
62
-
63
-
val dump : ?custom:(Obj.t -> (Buffer.t -> Obj.t -> unit) option) -> ?depth:int -> 'a -> string
···
+1
pkgs/top-level/aliases.nix
+1
pkgs/top-level/aliases.nix
···
1104
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
1105
ofp = throw "ofp is not compatible with odp-dpdk";
1106
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
1107
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
1108
openafs_1_8 = openafs; # Added 2022-08-22
1109
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
···
1104
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
1105
ofp = throw "ofp is not compatible with odp-dpdk";
1106
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
1107
+
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
1108
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
1109
openafs_1_8 = openafs; # Added 2022-08-22
1110
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
-4
pkgs/top-level/all-packages.nix
-4
pkgs/top-level/all-packages.nix
···
15648
15649
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
15650
15651
-
opa = callPackage ../development/compilers/opa {
15652
-
ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
15653
-
};
15654
-
15655
opaline = callPackage ../development/tools/ocaml/opaline { };
15656
15657
opam = callPackage ../development/tools/ocaml/opam {