diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-02-23 17:19:25 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-02-28 19:10:34 +0100 |
| commit | 7f327dfa63c09997213dc8b710e777fd4ed5cf97 (patch) | |
| tree | ac9e943ba99a0961244a9a7f08a349131a93ab09 | |
| parent | d8ab8ddae1c3e5d0ce872a2cbfabaa616e6f93eb (diff) | |
| download | nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.tar nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.tar.gz nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.tar.bz2 nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.tar.lz nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.tar.xz nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.tar.zst nixpkgs-7f327dfa63c09997213dc8b710e777fd4ed5cf97.zip | |
ocamlPackages.ctypes: 0.11.5 -> 0.13.1
| -rw-r--r-- | pkgs/development/ocaml-modules/ctypes/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index b419971921b..0ddf3cb5995 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,19 +1,19 @@ -{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}: +{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: buildOcaml rec { name = "ctypes"; - version = "0.11.5"; + version = "0.13.1"; minimumSupportedOcamlVersion = "4"; - src = fetchurl { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/67e711ec891e087fbe1e0b4665aa525af4eaa409.tar.gz"; + sha256 = "1z84s5znr3lj84rzv6m37xxj9h7fwx4qiiykx3djf52qgk1rb2xb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ libffi ]; + propagatedBuildInputs = [ integers libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 5cd4c6064e0..fdfd0338bb2 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pipebang, sexplib, ocaml_oasis}: +{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +}: buildOcamlJane rec { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; + postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH"; propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { |