diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-02-02 07:51:23 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-04-28 14:31:45 +0000 |
commit | eaf0592498070e3184316c9c63c3dd1c5264cd95 (patch) | |
tree | 404c96149426c8153ffae97620d5666aacd3a782 /pkgs/development | |
parent | 75cfbdf33b0423c2bd8f9fb20393267ef02bbf9d (diff) | |
download | nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.tar nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.tar.gz nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.tar.bz2 nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.tar.lz nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.tar.xz nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.tar.zst nixlib-eaf0592498070e3184316c9c63c3dd1c5264cd95.zip |
ocamlPackages.ocsigen_server: 2.8 -> 2.9
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/ocaml-modules/ocsigen-server/default.nix | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 081f9edbecf9..efbb12304970 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl, -lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, +{ stdenv, fetchurl, ocaml, findlib, which, react, ssl +, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml +, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl }: let mkpath = p: n: @@ -9,17 +9,32 @@ let mkpath = p: n: "${p}/lib/ocaml/${v}/site-lib/${n}"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "2.9"; + sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; + buildInputs = [ lwt_react lwt_ssl ]; + ldpath = ""; + } else { + version = "2.8"; + sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + buildInputs = [ lwt2 ]; + ldpath = "${mkpath lwt2 "lwt"}"; + } +; in + stdenv.mkDerivation { - name = "ocsigenserver-2.8"; + name = "ocsigenserver-${param.version}"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; + inherit (param) sha256; }; - buildInputs = [ocaml which findlib react ssl lwt + buildInputs = [ocaml which findlib react ssl ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; + ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] + ++ (param.buildInputs or []); configureFlags = "--root $(out) --prefix /"; @@ -31,7 +46,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; |