diff options
| author | Marco Maggesi <1809783+maggesi@users.noreply.github.com> | 2019-10-13 18:06:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 18:06:23 +0200 |
| commit | 24d0bd37b5ad2307f4f3f22c797d2123a9e143a9 (patch) | |
| tree | dd6d8371bcc83b446f4d1e2b41fab1d92ceb072a /pkgs/development/ocaml-modules/ssl | |
| parent | ff1ed720e280f2e4ff57dd869e93dbc9eb034040 (diff) | |
| parent | 4fb9a75fc85f82f2bb186d23b89190b53ad3ec1b (diff) | |
| download | nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.gz nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.bz2 nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.lz nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.xz nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.tar.zst nixpkgs-24d0bd37b5ad2307f4f3f22c797d2123a9e143a9.zip | |
Merge branch 'master' into rename-z77z-into-maggesi
Diffstat (limited to 'pkgs/development/ocaml-modules/ssl')
| -rw-r--r-- | pkgs/development/ocaml-modules/ssl/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 356b393aa03..82e6342a34a 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,27 +1,23 @@ -{ 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.maggesi ]; |