diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-22 20:57:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-22 20:57:14 +0200 |
| commit | e78fd235649e52180198f9f65ca9f172f8fe8161 (patch) | |
| tree | ce63052e1bfb8fe03dd3fcf6f9fb4cd00ff1b495 /pkgs/development/ocaml-modules | |
| parent | 2d9bd29cc5c949b84fd595334b6e223c22be438b (diff) | |
| parent | cf68a14a0184138ca7644a14c0724fa32e0e34a5 (diff) | |
| download | nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.tar nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.gz nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.bz2 nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.lz nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.xz nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.tar.zst nixlib-e78fd235649e52180198f9f65ca9f172f8fe8161.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1474932
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/io-page/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 24aa25570829..72b7a3a54ce7 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, configurator, cstruct }: -let version = "1.6.1"; in +let version = "2.0.1"; in stdenv.mkDerivation { - name = "ocaml-io-page-${version}"; + name = "ocaml${ocaml.version}-io-page-${version}"; src = fetchzip { - url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; - sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz"; + url = "https://github.com/mirage/io-page/archive/${version}.tar.gz"; + sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib jbuilder configurator ]; propagatedBuildInputs = [ cstruct ]; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/mirage/io-page; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.isc; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; |