diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-05 12:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 12:01:22 +0000 |
| commit | 4d8ab2a7038169050381133439b450bec1858577 (patch) | |
| tree | d1e5abf73b0a9601cfd73a8789a16cef90a69909 /pkgs/development/ocaml-modules | |
| parent | 7c3da72c879046f0e0c14e04607b37c1274d5046 (diff) | |
| parent | 2aa67111a851c1ff1f9cfb070ab1d4568e7764a5 (diff) | |
| download | nixlib-4d8ab2a7038169050381133439b450bec1858577.tar nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.gz nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.bz2 nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.lz nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.xz nixlib-4d8ab2a7038169050381133439b450bec1858577.tar.zst nixlib-4d8ab2a7038169050381133439b450bec1858577.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5be5f09d1965..fac5789dcdd1 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,15 +1,11 @@ -{ stdenv +{ buildDunePackage , lib , fetchFromGitHub , which , ocsigen_server -, ocaml , lwt_react -, opaline -, ocamlbuild , ppx_deriving , ppx_optcomp -, findlib , js_of_ocaml-ocamlbuild , js_of_ocaml-ppx , js_of_ocaml-ppx_deriving_json @@ -20,23 +16,19 @@ , ocsipersist }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "eliom"; - version = "10.1.0"; + version = "10.1.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw="; + hash = "sha256-Cxwp534ADUO7AHnxZnGsrqxGDkhcJ314M5wytO4e8/0="; }; nativeBuildInputs = [ - ocaml which - findlib - opaline - ocamlbuild ]; buildInputs = [ js_of_ocaml-ocamlbuild @@ -58,12 +50,6 @@ stdenv.mkDerivation rec { strictDeps = true; - installPhase = '' - runHook preInstall - opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - setupHook = [ ./setup-hook.sh ]; meta = { |