diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2024-01-16 07:25:21 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2024-01-16 07:50:46 +0100 |
| commit | 515daaad9a9a0191c3d728a8217d81194b527ef1 (patch) | |
| tree | 215548882ad444da223e329d0c442de18e888d5d | |
| parent | 5223d1f86aab688bf05c6069b87be5f662d84eac (diff) | |
ocamlPackages.gapi-ocaml: 0.4.4 → 0.4.5
ocamlPackages.google-drive-ocamlfuse: 0.7.30 → 0.7.31 google-drive-ocamlfuse: use default version of OCaml
| -rw-r--r-- | pkgs/applications/networking/google-drive-ocamlfuse/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 281c9e5526eb0..7f313514e1c07 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub +{ lib, ocaml, buildDunePackage, fetchFromGitHub , extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3 , tiny_httpd , ounit2 @@ -6,17 +6,16 @@ buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.30"; - duneVersion = "3"; + version = "0.7.31"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "sha256-DWG0nBiqeVHaYQfGzU43gGwL4m8X61x5/RT5jD4AwYA="; + hash = "sha256-4Fs4e4rXSeumaMDXRqGLpPuFs6DC8dmkywGaBqR5sFA="; }; - doCheck = true; + doCheck = lib.versionOlder ocaml.version "5.0"; checkInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index dc8bc2568415e..1db8180934bfb 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,12 +1,11 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml -, cryptokit, ocamlnet, ocurl, yojson +, camlp-streams, cppo, cryptokit, ocurl, yojson , ounit2 }: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.4.4"; - duneVersion = "3"; + version = "0.4.5"; minimalOCamlVersion = "4.08"; @@ -14,10 +13,12 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE="; + hash = "sha256-qlQEE8l/H22bb1VcK9YehR+9L5XepMu8JY7OLw1OIXg="; }; - propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; + nativeBuildInputs = [ cppo ]; + + propagatedBuildInputs = [ camlp-streams cryptokit ocurl yojson ]; doCheck = true; checkInputs = [ ounit2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d268f7b9bca90..a11be807d22e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31712,7 +31712,7 @@ with pkgs; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; - inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse; + inherit (ocamlPackages) google-drive-ocamlfuse; googler = callPackage ../applications/misc/googler { python = python3; |