diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-07 00:39:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-07 00:39:47 +0000 |
commit | e7e56512fc73b696ddfaeccda95ace4e6eebdb63 (patch) | |
tree | 991dde5fe0eb5f92b886d7cae3cbad32ee04b45d /pkgs/development/ocaml-modules | |
parent | 11719df4a5959dc84dafec3dacb2e93f7c42234d (diff) | |
parent | d83d68693c76e06faf866475915344a32b0a858a (diff) | |
download | nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.tar nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.tar.gz nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.tar.bz2 nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.tar.lz nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.tar.xz nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.tar.zst nixlib-e7e56512fc73b696ddfaeccda95ace4e6eebdb63.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/lambdasoup/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/markup/default.nix | 19 |
2 files changed, 21 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index f535ee78fef9..de5fbf63b383 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage, markup }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, markup, ounit2 }: buildDunePackage rec { pname = "lambdasoup"; - version = "0.7.1"; + version = "0.7.2"; + + minimumOCamlVersion = "4.02"; + + useDune2 = true; src = fetchFromGitHub { owner = "aantron"; repo = pname; rev = version; - sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks"; + sha256 = "0php51lyz3ll0psazjd59yw02xb9w84150gkyiwmn3fa0iq8nf7m"; }; propagatedBuildInputs = [ markup ]; + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit2 ]; + meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; homepage = "https://aantron.github.io/lambdasoup/"; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 8b3525d26345..a8246e1cc7e8 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,23 +1,26 @@ -{ lib, buildDunePackage, fetchzip, uutf }: +{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }: buildDunePackage rec { pname = "markup"; - version = "0.8.2"; + version = "1.0.0"; + + useDune2 = true; src = fetchzip { url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz"; - sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn"; - }; + sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9"; + }; + + propagatedBuildInputs = [ uchar uutf ]; - propagatedBuildInputs = [ uutf ]; + checkInputs = [ ounit2 ]; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { homepage = "https://github.com/aantron/markup.ml/"; description = "A pair of best-effort parsers implementing the HTML5 and XML specifications"; license = licenses.mit; - maintainers = with maintainers; [ - gal_bolle - ]; + maintainers = with maintainers; [ gal_bolle ]; }; } |