diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 08:22:13 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 08:22:13 +0200 |
commit | c1f851b2ee3d41ca0819b4de7e6c1f2e5bdfe575 (patch) | |
tree | fda743cf35edb0e7d1bf60511e8a0b523ae890b5 /pkgs/development/ocaml-modules | |
parent | 3349d99e260d095c8f0a1e5ba79b949c85f125d1 (diff) | |
parent | a956f62ea4ea5a9e5bd18e87b1ea362e583dbcad (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/mirage-crypto/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/sedlex/2.nix | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index eec6f447dc46c..2eda6d5f55ea1 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config , withFreestanding ? false , ocaml-freestanding }: @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.9.2"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "da200c0afdbe63474ab19f2bc616e26c10b0e4fbb53fb97fefb2794212f5d442"; + sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d"; }; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { nativeBuildInputs = [ dune-configurator pkg-config ]; propagatedBuildInputs = [ - cstruct eqaf + cstruct eqaf bigarray-compat ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 927acc1819eb9..6db40dd9c7ebe 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -4,12 +4,11 @@ , buildDunePackage , ocaml , gen -, ppx_tools_versioned -, ocaml-migrate-parsetree +, ppxlib , uchar }: -if lib.versionOlder ocaml.version "4.02.3" +if lib.versionOlder ocaml.version "4.08" then throw "sedlex is not available for OCaml ${ocaml.version}" else @@ -32,7 +31,7 @@ let in buildDunePackage rec { pname = "sedlex"; - version = "2.2"; + version = "2.3"; useDune2 = true; @@ -40,11 +39,11 @@ buildDunePackage rec { owner = "ocaml-community"; repo = "sedlex"; rev = "v${version}"; - sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3"; + sha256 = "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar"; }; propagatedBuildInputs = [ - gen uchar ocaml-migrate-parsetree ppx_tools_versioned + gen uchar ppxlib ]; preBuild = '' @@ -60,6 +59,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/ocaml-community/sedlex"; + changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES"; description = "An OCaml lexer generator for Unicode"; license = lib.licenses.mit; maintainers = [ lib.maintainers.marsam ]; |