Skip to content

Commit b81e40b

Browse files
committed
aslp_offline_js: init at 0-unstable-2025-02-05, and add to aslp_web
1 parent 8ca8b6b commit b81e40b

File tree

3 files changed

+44
-3
lines changed

3 files changed

+44
-3
lines changed

aslp/aslp_offline_js.nix

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{ lib
2+
, fetchFromGitHub
3+
, buildDunePackage
4+
# pkgs
5+
# ocamlPackages
6+
, aslp_web
7+
, zarith_stubs_js
8+
, js_of_ocaml
9+
, js_of_ocaml-ppx
10+
# for testing
11+
, testers
12+
, aslp_offline
13+
}:
14+
15+
buildDunePackage {
16+
pname = "aslp_offline_js";
17+
version = aslp_web.version;
18+
19+
minimalOCamlVersion = "5.0";
20+
21+
src = aslp_web.src;
22+
23+
checkInputs = [ ];
24+
nativeCheckInputs = [ ];
25+
buildInputs = [ js_of_ocaml-ppx ];
26+
nativeBuildInputs = [ js_of_ocaml ];
27+
propagatedBuildInputs = [ aslp_offline js_of_ocaml zarith_stubs_js ];
28+
29+
doCheck = true;
30+
31+
outputs = [ "out" "dev" ];
32+
33+
meta = {
34+
homepage = "https://github.com/katrinafyi/aslp-web";
35+
description = "AArch64 lifter generated by ASLp by offline partial evaluation (offline lifter component)";
36+
maintainers = with lib.maintainers; [ katrinafyi ];
37+
};
38+
}

aslp/aslp_web.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
, buildDunePackage
44
, nix-gitignore
55
, asli
6+
, aslp_offline_js
67
, js_of_ocaml
78
, js_of_ocaml-ppx
89
, js_of_ocaml-compiler
9-
, zarith_stubs_js
10+
, zarith_stubs_js
1011
, nodejs-slim
1112
, python3
1213
}:
@@ -15,7 +16,7 @@ buildDunePackage rec {
1516
pname = "aslp_web";
1617
version = "0-unstable-2025-02-05";
1718

18-
buildInputs = [ asli js_of_ocaml js_of_ocaml-ppx zarith_stubs_js ];
19+
propagatedBuildInputs = [ asli js_of_ocaml js_of_ocaml-ppx zarith_stubs_js aslp_offline_js ];
1920
nativeBuildInputs = [ python3 js_of_ocaml-compiler nodejs-slim ];
2021

2122
src = fetchFromGitHub {

aslp/overlay.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ final: prev:
88
inherit (final.ocamlPackages_pac_5) aslp-server;
99
inherit (final.ocamlPackages_pac_5) aslp_client_server_ocaml;
1010
inherit (final.ocamlPackages_pac_5) aslp_offline;
11+
inherit (final.ocamlPackages_pac_5) aslp_offline_js;
1112

1213
overlay_ocamlPackages = ofinal: oprev: {
1314
asli = ofinal.callPackage ./asli.nix { inherit (final) z3; ocaml_z3 = ofinal.z3; };
@@ -17,7 +18,8 @@ final: prev:
1718
aslp_server_http = ofinal.aslp-server;
1819

1920

20-
aslp_offline = ofinal.callPackage ./aslp_offline.nix {};
21+
aslp_offline = ofinal.callPackage ./aslp_offline.nix { };
22+
aslp_offline_js = ofinal.callPackage ./aslp_offline_js.nix { zarith_stubs_js = ofinal.zarith_stubs_js_0_17; };
2123

2224
zarith_stubs_js_0_17 = ofinal.callPackage ./zarith_stubs_js.nix { };
2325
aslp_web = ofinal.callPackage ./aslp_web.nix { zarith_stubs_js = ofinal.zarith_stubs_js_0_17; };

0 commit comments

Comments
 (0)