diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
| commit | 81039713fad72bcfb6d29e358866344c254096c2 (patch) | |
| tree | 5150eb44e296607c43c5c7ece21249d0e39ff098 /pkgs/development/ocaml-modules | |
| parent | 21df05d1ad9ad8b3e8138138f65525d2e6324341 (diff) | |
| parent | 8fbdb40ef0ce39e6605db3dfd223402636de8907 (diff) | |
| download | nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.gz nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.bz2 nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.lz nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.xz nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.zst nixlib-81039713fad72bcfb6d29e358866344c254096c2.zip | |
Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ppx_tools/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index e8cdc180b729..6c0d772650cf 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let - version = "2.5.0"; + version = "2.5.2"; inherit (stdenv.lib) optional getVersion versionAtLeast; ocaml_version = getVersion ocaml; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0jgg51aqbnia33l7bhgirnfpqybjwzpd85qzzd9znnc1a27gv8vr"; + sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; }; buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 1fea9bbd1911..c64e84869d62 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation { - name = "ocaml-ppx_tools-0.99.2"; + name = "ocaml-ppx_tools-4.02.3"; src = fetchzip { - url = https://github.com/alainfrisch/ppx_tools/archive/ppx_tools_0.99.2.tar.gz; - sha256 = "1m09r2sjcb37i4dyhpbk9n2wxkcvpib6bvairsird91fm9w0vqw7"; + url = https://github.com/alainfrisch/ppx_tools/archive/v4.02.3.tar.gz; + sha256 = "0varkd93hgrarwwkrjp2yy735q7jqzba75sskyanmvkb576wpcxv"; }; buildInputs = [ ocaml findlib ]; |