ocamlPackages.uri: 3.1.0 → 4.0.0

This commit is contained in:
Vincent Laporte 2020-12-06 09:36:39 +01:00 committed by Vincent Laporte
parent 57f2285079
commit d702e6e6ab
2 changed files with 10 additions and 7 deletions

View File

@ -1,19 +1,21 @@
{ lib, fetchurl, buildDunePackage, ounit { lib, fetchurl, buildDunePackage, ounit
, re, stringext , angstrom, stringext
}: }:
buildDunePackage rec { buildDunePackage rec {
minimumOCamlVersion = "4.03"; minimumOCamlVersion = "4.03";
pname = "uri"; pname = "uri";
version = "3.1.0"; version = "4.0.0";
useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4"; sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380";
}; };
buildInputs = [ ounit ]; checkInputs = [ ounit ];
propagatedBuildInputs = [ re stringext ]; propagatedBuildInputs = [ angstrom stringext ];
doCheck = true; doCheck = true;
meta = { meta = {

View File

@ -6,8 +6,9 @@ else
buildDunePackage { buildDunePackage {
pname = "uri-sexp"; pname = "uri-sexp";
inherit (uri) version src doCheck meta; inherit (uri) version useDune2 src meta;
buildInputs = [ ounit ]; checkInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
} }