diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-09-30 19:57:19 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-10-13 06:52:00 +0200 |
| commit | e1b9556f87ba339b2cee43905286ab559e5fc402 (patch) | |
| tree | 5cb30835668f93d01d4d349e50f9556e2f9b9092 /pkgs/development/ocaml-modules | |
| parent | 710e28bdd8a137c29eb4c4d6b12207ee17cf52a9 (diff) | |
| download | nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.tar nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.tar.gz nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.tar.bz2 nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.tar.lz nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.tar.xz nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.tar.zst nixlib-e1b9556f87ba339b2cee43905286ab559e5fc402.zip | |
ocamlPackages.ocsigen_server: 2.11.0 → 2.15.0
ocamlPackages.ssl: 0.5.5 → 0.5.9
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocsigen-server/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ssl/default.nix | 26 |
2 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index df484b230c29..426fecf39155 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -13,14 +13,14 @@ let mkpath = p: n: in stdenv.mkDerivation rec { - version = "2.11.0"; + version = "2.15.0"; pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigenserver"; rev = version; - sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2"; + sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw"; }; buildInputs = [ which makeWrapper ocaml findlib diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index b24d799cf28e..5ee77425a2f0 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchzip, which, openssl, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.5"; +buildDunePackage rec { + pname = "ssl"; + version = "0.5.9"; - src = fetchzip { - url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; - sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ssl"; + rev = version; + sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0"; }; - buildInputs = [which ocaml findlib]; - + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [openssl]; - dontAddPrefix = true; - - createFindlibDestdir = true; - meta = { homepage = http://savonet.rastageeks.org/; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; - platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.z77z + lib.maintainers.z77z ]; }; } |