diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-11-19 07:36:41 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-11-26 06:55:12 +0100 |
commit | 4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b (patch) | |
tree | c4174669d7e028dd0ac77c93cfa93f21a87139dc | |
parent | 4d47330bef2115d8cb0ac81a48682924c5fe9f27 (diff) | |
download | nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.tar nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.tar.gz nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.tar.bz2 nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.tar.lz nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.tar.xz nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.tar.zst nixpkgs-4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b.zip |
ocamlPackages.cstruct: 4.0.0 → 5.0.0
-rw-r--r-- | pkgs/development/ocaml-modules/cstruct/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cstruct/lwt.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cstruct/ppx.nix | 6 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cstruct/sexp.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/cstruct/unix.nix | 2 |
5 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 01a32fc09a2..acd5d83e4f1 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,14 +1,20 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, bigarray-compat }: buildDunePackage rec { pname = "cstruct"; - version = "4.0.0"; + version = "5.0.0"; + + useDune2 = true; + + minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; - sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a"; + sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb"; }; + propagatedBuildInputs = [ bigarray-compat ]; + meta = { description = "Access C-like structures directly from OCaml"; license = lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index 5a10d7cae48..f340bfcda25 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "cstruct-lwt"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index 22fe4ac47cf..feb8feac6b6 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -6,9 +6,9 @@ else buildDunePackage { pname = "ppx_cstruct"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.03"; - propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ]; + propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index d0df442013f..04bb10d6f75 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -6,7 +6,7 @@ else buildDunePackage rec { pname = "cstruct-sexp"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; doCheck = lib.versionAtLeast ocaml.version "4.03"; checkInputs = lib.optional doCheck alcotest; diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 7cb5d665869..b7e0df0185c 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "cstruct-unix"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.06"; |