From 2ccc9a8bd166bf0d215b06d7cbff4317ed8fc8c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Nov 2015 11:45:55 +0100 Subject: [PATCH] easy-format: 1.0.2 -> 1.1.0 --- .../ocaml-modules/easy-format/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index 0554b67f1d7..bac558cc50a 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,25 +1,27 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchzip, ocaml, findlib }: let pname = "easy-format"; - version = "1.0.2"; - webpage = "http://mjambon.com/${pname}.html"; + version = "1.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "07wlgprqvk92z0p2xzbnvh312ca6gvhy3xc6hxlqfawnnnin7rzi"; + src = fetchzip { + url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; + sha256 = "084blm13k5lakl5wq3qfxbd0l0bwblvk928v75xcxpaqwv426w5a"; }; buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; + doCheck = true; + checkTarget = "test"; + meta = with stdenv.lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; - homepage = "${webpage}"; + homepage = "http://mjambon.com/${pname}.html"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; };