diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-05 06:00:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 06:00:59 +0000 |
| commit | 397840014f7509f5f36935798f7424999668eaa6 (patch) | |
| tree | 7420d38f156c3bdad895d7085f4d2fbc9e9f5b67 /pkgs/development/ocaml-modules | |
| parent | 740525486e1399710ed99c841f3efdc7e5539c37 (diff) | |
| parent | 6225a5106080e3c6e150315e0b55c190ccd5044c (diff) | |
| download | nixlib-397840014f7509f5f36935798f7424999668eaa6.tar nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.gz nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.bz2 nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.lz nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.xz nixlib-397840014f7509f5f36935798f7424999668eaa6.tar.zst nixlib-397840014f7509f5f36935798f7424999668eaa6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/gluten/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/gluten/eio.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/gluten/lwt-unix.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/gluten/lwt.nix | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index d0f41d202689..5c55f2f09bfd 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,25 +3,22 @@ , faraday , fetchurl , lib -, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; + hash = "sha256-mGKbbQSPMOumUCtxrAdoBt5y2RrkAf58spkUymTYhYM="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday - ke ]; doCheck = false; # No tests diff --git a/pkgs/development/ocaml-modules/gluten/eio.nix b/pkgs/development/ocaml-modules/gluten/eio.nix new file mode 100644 index 000000000000..9c78b1d73cd4 --- /dev/null +++ b/pkgs/development/ocaml-modules/gluten/eio.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, gluten, eio }: + +buildDunePackage { + pname = "gluten-eio"; + inherit (gluten) src version; + + propagatedBuildInputs = [ gluten eio ]; + + meta = gluten.meta // { + description = "EIO runtime for gluten"; + }; +} diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index cec427c3ad61..c3a360322a14 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -9,8 +9,6 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ faraday-lwt-unix gluten-lwt diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index cfa736c4bc99..e4cfb0d8db02 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "gluten-lwt"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ gluten lwt |