diff options
author | Florent Becker <florent.becker@ens-lyon.org> | 2014-05-17 20:01:45 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-30 19:37:15 +0400 |
commit | 7e2766d6464d94d2afd97354b882e777b85d4e60 (patch) | |
tree | 3435d708999340584015dcc0dc87bf990d8dd54d /pkgs/development | |
parent | 337a3b821278b41952a4970f84ec740e4c00346b (diff) | |
download | nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.tar nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.tar.gz nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.tar.bz2 nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.tar.lz nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.tar.xz nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.tar.zst nixpkgs-7e2766d6464d94d2afd97354b882e777b85d4e60.zip |
Update ocaml_lwt to version 2.4.5 (from git)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9ef10906365..10175a1dbb0 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,21 +1,25 @@ -{stdenv, fetchurl, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl}: +{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "2.1.1"; + version = "2.4.5"; in stdenv.mkDerivation { + + name = "ocaml-lwt-${version}"; - src = fetchurl { - url = "http://ocsigen.org/download/lwt-${version}.tar.gz"; - sha256 = "1zjn0sgihryshancn4kna1xslhc8gifliny1qd3a85f72xxxnw0w"; + src = fetchgit { + url = git://github.com/ocsigen/lwt; + rev = "refs/tags/${version}"; + sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e"; }; - buildInputs = [which cryptopp ocaml findlib ocaml_react ocaml_ssl]; + buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib ocaml_react ocaml_ssl libev ncurses ocaml_text glib]; + + configureFlags = [ "--enable-all" ]; - configurePhase = "true"; + createFindlibDestdir = true; meta = { homepage = http://ocsigen.org/lwt; @@ -23,7 +27,7 @@ stdenv.mkDerivation { license = "LGPL"; platforms = ocaml.meta.platforms; maintainers = [ - stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle ]; }; } |