diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-12-06 09:36:39 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-12-08 17:33:12 +0100 |
| commit | d702e6e6ab1206b34e282e5a22ef2f3958a457c1 (patch) | |
| tree | 2501280a934805f89ca48ea3efecf360c37af809 /pkgs/development/ocaml-modules/uri | |
| parent | 57f2285079d724cf3b7ef016d25476edf1309198 (diff) | |
| download | nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.tar nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.tar.gz nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.tar.bz2 nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.tar.lz nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.tar.xz nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.tar.zst nixpkgs-d702e6e6ab1206b34e282e5a22ef2f3958a457c1.zip | |
ocamlPackages.uri: 3.1.0 → 4.0.0
Diffstat (limited to 'pkgs/development/ocaml-modules/uri')
| -rw-r--r-- | pkgs/development/ocaml-modules/uri/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/uri/sexp.nix | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 6a7c03b9bb6..7933b3bd8d4 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,19 +1,21 @@ { lib, fetchurl, buildDunePackage, ounit -, re, stringext +, angstrom, stringext }: buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "uri"; - version = "3.1.0"; + version = "4.0.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4"; + sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380"; }; - buildInputs = [ ounit ]; - propagatedBuildInputs = [ re stringext ]; + checkInputs = [ ounit ]; + propagatedBuildInputs = [ angstrom stringext ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix index c6f979e5a3e..83be70c3649 100644 --- a/pkgs/development/ocaml-modules/uri/sexp.nix +++ b/pkgs/development/ocaml-modules/uri/sexp.nix @@ -6,8 +6,9 @@ else buildDunePackage { 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 ]; + doCheck = lib.versionAtLeast ocaml.version "4.08"; } |