mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 19:55:41 +03:00
ocamlPackages.js_of_ocaml: 5.9.1 → 6.0.1
This commit is contained in:
parent
e90f80f1c3
commit
814ecdf1a4
11 changed files with 58 additions and 23 deletions
|
@ -14,7 +14,6 @@ buildDunePackage rec {
|
|||
pname = "ctypes_stubs_js";
|
||||
version = "0.1";
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
|
@ -27,7 +26,12 @@ buildDunePackage rec {
|
|||
propagatedBuildInputs = [ integers_stubs_js ];
|
||||
nativeCheckInputs = [
|
||||
nodejs
|
||||
js_of_ocaml-compiler
|
||||
(
|
||||
if lib.versionAtLeast js_of_ocaml-compiler.version "6.0" then
|
||||
js_of_ocaml-compiler.override { version = "5.9.1"; }
|
||||
else
|
||||
js_of_ocaml-compiler
|
||||
)
|
||||
];
|
||||
checkInputs = [
|
||||
ctypes
|
||||
|
|
|
@ -8,7 +8,6 @@ buildDunePackage rec {
|
|||
pname = "ojs";
|
||||
|
||||
inherit (gen_js_api) version src;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ js_of_ocaml-compiler ];
|
||||
|
||||
|
|
|
@ -9,6 +9,16 @@
|
|||
zstd,
|
||||
}:
|
||||
|
||||
let
|
||||
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
|
||||
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
|
||||
gen_js_api = self.gen_js_api.override {
|
||||
inherit js_of_ocaml-compiler;
|
||||
ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
|
||||
};
|
||||
js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
|
||||
in
|
||||
|
||||
with self;
|
||||
|
||||
{
|
||||
|
|
|
@ -9,6 +9,16 @@
|
|||
krb5,
|
||||
}:
|
||||
|
||||
let
|
||||
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
|
||||
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
|
||||
gen_js_api = self.gen_js_api.override {
|
||||
inherit js_of_ocaml-compiler;
|
||||
ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
|
||||
};
|
||||
js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
|
||||
in
|
||||
|
||||
with self;
|
||||
|
||||
{
|
||||
|
|
|
@ -8,6 +8,16 @@
|
|||
zstd,
|
||||
}:
|
||||
|
||||
let
|
||||
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
|
||||
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
|
||||
gen_js_api = self.gen_js_api.override {
|
||||
inherit js_of_ocaml-compiler;
|
||||
ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
|
||||
};
|
||||
js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
|
||||
in
|
||||
|
||||
with self;
|
||||
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
menhir,
|
||||
menhirLib,
|
||||
sedlex,
|
||||
version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2",
|
||||
version ? if lib.versionAtLeast ocaml.version "4.11" then "6.0.1" else "5.8.2",
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
|
@ -22,6 +22,7 @@ buildDunePackage {
|
|||
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
||||
hash =
|
||||
{
|
||||
"6.0.1" = "sha256-gT2+4rYuFUEEnqI6IOQFzyROJ+v6mFl4XPpT4obSxhQ=";
|
||||
"5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc=";
|
||||
"5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo=";
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
buildDunePackage,
|
||||
js_of_ocaml-compiler,
|
||||
js_of_ocaml-ppx,
|
||||
js_of_ocaml,
|
||||
lwt,
|
||||
|
@ -10,7 +9,7 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-lwt";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src;
|
||||
inherit (js_of_ocaml) version src meta;
|
||||
|
||||
buildInputs = [ js_of_ocaml-ppx ];
|
||||
|
||||
|
@ -19,6 +18,4 @@ buildDunePackage {
|
|||
lwt
|
||||
lwt_log
|
||||
];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
@ -1,17 +1,14 @@
|
|||
{
|
||||
buildDunePackage,
|
||||
js_of_ocaml-compiler,
|
||||
ppxlib,
|
||||
js_of_ocaml,
|
||||
ppxlib,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "js_of_ocaml-ppx";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src;
|
||||
inherit (js_of_ocaml) version src meta;
|
||||
|
||||
buildInputs = [ js_of_ocaml ];
|
||||
propagatedBuildInputs = [ ppxlib ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
buildDunePackage,
|
||||
js_of_ocaml-compiler,
|
||||
js_of_ocaml,
|
||||
ppxlib,
|
||||
}:
|
||||
|
@ -8,12 +7,10 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-ppx_deriving_json";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src;
|
||||
inherit (js_of_ocaml) version src meta;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
js_of_ocaml
|
||||
ppxlib
|
||||
];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
buildDunePackage,
|
||||
js_of_ocaml-compiler,
|
||||
js_of_ocaml-ppx,
|
||||
js_of_ocaml,
|
||||
reactivedata,
|
||||
|
@ -10,7 +9,7 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-tyxml";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src;
|
||||
inherit (js_of_ocaml) version src meta;
|
||||
|
||||
buildInputs = [ js_of_ocaml-ppx ];
|
||||
|
||||
|
@ -19,6 +18,4 @@ buildDunePackage {
|
|||
reactivedata
|
||||
tyxml
|
||||
];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
@ -460,7 +460,15 @@ let
|
|||
stdenv = pkgs.gcc13Stdenv;
|
||||
};
|
||||
|
||||
eliom = callPackage ../development/ocaml-modules/eliom { };
|
||||
eliom = let
|
||||
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
|
||||
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
|
||||
in callPackage ../development/ocaml-modules/eliom rec {
|
||||
js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
|
||||
js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; };
|
||||
js_of_ocaml-lwt = self.js_of_ocaml-lwt.override { inherit js_of_ocaml js_of_ocaml-ppx; };
|
||||
js_of_ocaml-tyxml = self.js_of_ocaml-tyxml.override { inherit js_of_ocaml js_of_ocaml-ppx; };
|
||||
};
|
||||
|
||||
elpi = callPackage ../development/ocaml-modules/elpi (
|
||||
let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15"
|
||||
|
@ -1425,7 +1433,12 @@ let
|
|||
|
||||
ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
|
||||
|
||||
ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
|
||||
ocsigen-toolkit = let
|
||||
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
|
||||
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
|
||||
in callPackage ../development/ocaml-modules/ocsigen-toolkit {
|
||||
js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; };
|
||||
};
|
||||
|
||||
ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue