diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-07-11 08:46:37 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-07-18 09:11:35 +0200 |
| commit | ae0b8a01b10a689d0d33e9024b8480069e5c854d (patch) | |
| tree | 3f7610891244c070d7bb4c40def2d10a9c86eb64 | |
| parent | 950a258b9ef24ca4346bbf722a694c2ab54e4654 (diff) | |
ocamlPackages.gapi-ocaml: 0.4.2 → 0.4.3
| -rw-r--r-- | pkgs/applications/networking/google-drive-ocamlfuse/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 02df4313f7fc2..eb677eb00ded7 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub -, ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +, ocaml_extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3 , tiny_httpd , ounit }: @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; - buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 tiny_httpd ]; + buildInputs = [ ocaml_extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index c417d94e2947d..f9e566eb04941 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,31 +1,29 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml , cryptokit, ocamlnet, ocurl, yojson -, ounit +, ounit2 }: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.4.2"; + version = "0.4.3"; - useDune2 = true; - - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "sha256-imicHOlNjPHHW/lcWRJmURafYZFe/6J3efKPJcel8J8="; + sha256 = "sha256-V0GB9Bd06IdcI5PDFHGVZ0Y/qi7tTs/4ITqPXUOxCLs="; }; propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = { description = "OCaml client for google services"; - homepage = "http://gapi-ocaml.forge.ocamlcore.org"; + inherit (src.meta) homepage; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bennofs ]; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d794592461f79..07257daa0039b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -549,7 +549,7 @@ let dypgen = callPackage ../development/ocaml-modules/dypgen { }; - gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; + gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { }; |