diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-08-01 10:53:09 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-08-08 19:18:39 +0200 |
| commit | dfc206394e271d02c7150cf4bc249ca5677f7906 (patch) | |
| tree | 9b523fe641eb63ceac8f98d5a87cef6858d31d9e /pkgs/development/ocaml-modules/eliom | |
| parent | 781482a3cdf9acaab0c94ab46fe8429a78d7ddd2 (diff) | |
| download | nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.tar nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.tar.gz nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.tar.bz2 nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.tar.lz nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.tar.xz nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.tar.zst nixpkgs-dfc206394e271d02c7150cf4bc249ca5677f7906.zip | |
ocamlPackages.ocsigen_server: 2.18.0 → 4.0.1
ocamlPackages.eliom: 6.12.4 → 8.6.0 ocamlPackages.ocsigen-start: 2.18.0 → 4.3.0
Diffstat (limited to 'pkgs/development/ocaml-modules/eliom')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 92d89afe398..79c7a650cff 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib , ocaml-migrate-parsetree @@ -7,34 +7,24 @@ , js_of_ocaml-lwt , js_of_ocaml-tyxml , lwt_ppx +, ocamlnet }: -if !lib.versionAtLeast ocaml.version "4.07" -then throw "eliom is not available for OCaml ${ocaml.version}" -else - stdenv.mkDerivation rec { pname = "eliom"; - version = "6.12.4"; + version = "8.6.0"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz"; + sha256 = "0s1hpawwhqp4qcy8w1067n8c6zg8jcjpzplc39bjbb1ycqw667j9"; }; - patches = [ - # Compatibility with js_of_ocaml >= 3.9.0, remove at next release - (fetchpatch { - url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch"; - sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p"; - }) - ]; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild ocaml-migrate-parsetree js_of_ocaml-ppx_deriving_json opaline ppx_tools_versioned + ocamlnet ]; propagatedBuildInputs = [ |