From 0f4cee585abe6290aae9fc744108e39814a1eb75 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 15 Jul 2021 09:34:54 +0200 Subject: [PATCH] ocamlPackages.resto: init at 0.6.1 (#129522) ocamlPackages.resto: init at 0.6.1 ocamlPackages.resto-acl: init at 0.6.1 ocamlPackages.resto-json: init at 0.6.1 ocamlPackages.resto-directory: init at 0.6.1 ocamlPackages.resto-cohttp: init at 0.6.1 ocamlPackages.ezresto: init at 0.6.1 ocamlPackages.ezresto-directory: init at 0.6.1 ocamlPackages.resto-cohttp-server: init at 0.6.1 ocamlPackages.resto-cohttp-client: init at 0.6.1 ocamlPackages.resto-cohttp-self-serving-client: init at 0.6.1 --- pkgs/development/ocaml-modules/resto/acl.nix | 13 +++++++++ .../ocaml-modules/resto/cohttp-client.nix | 20 +++++++++++++ .../resto/cohttp-self-serving-client.nix | 27 ++++++++++++++++++ .../ocaml-modules/resto/cohttp-server.nix | 25 +++++++++++++++++ .../ocaml-modules/resto/cohttp.nix | 12 ++++++++ .../ocaml-modules/resto/default.nix | 28 +++++++++++++++++++ .../ocaml-modules/resto/directory.nix | 11 ++++++++ .../ocaml-modules/resto/ezresto-directory.nix | 13 +++++++++ .../ocaml-modules/resto/ezresto.nix | 12 ++++++++ pkgs/development/ocaml-modules/resto/json.nix | 12 ++++++++ pkgs/top-level/ocaml-packages.nix | 12 ++++++++ 11 files changed, 185 insertions(+) create mode 100644 pkgs/development/ocaml-modules/resto/acl.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp-client.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp-server.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp.nix create mode 100644 pkgs/development/ocaml-modules/resto/default.nix create mode 100644 pkgs/development/ocaml-modules/resto/directory.nix create mode 100644 pkgs/development/ocaml-modules/resto/ezresto-directory.nix create mode 100644 pkgs/development/ocaml-modules/resto/ezresto.nix create mode 100644 pkgs/development/ocaml-modules/resto/json.nix diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix new file mode 100644 index 00000000000..7ac05cd62da --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, resto, uri }: + +buildDunePackage { + pname = "resto-acl"; + inherit (resto) src version meta useDune2 doCheck; + + minimalOCamlVersion = "4.05"; + + propagatedBuildInputs = [ + resto + uri + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix new file mode 100644 index 00000000000..2dc651045ba --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -0,0 +1,20 @@ +{ buildDunePackage +, resto +, resto-directory +, resto-cohttp +, uri +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-client"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-cohttp + uri + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix new file mode 100644 index 00000000000..88f2ef25e6a --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, resto +, resto-directory +, resto-acl +, resto-cohttp +, resto-cohttp-client +, resto-cohttp-server +, uri +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-self-serving-client"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-acl + resto-cohttp + resto-cohttp-client + resto-cohttp-server + uri + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix new file mode 100644 index 00000000000..61a5d93e9fc --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, resto +, resto-directory +, resto-acl +, resto-cohttp +, cohttp-lwt-unix +, conduit-lwt-unix +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-server"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-acl + resto-cohttp + cohttp-lwt-unix + conduit-lwt-unix + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix new file mode 100644 index 00000000000..c29e589057c --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, resto, resto-directory, cohttp-lwt }: + +buildDunePackage { + pname = "resto-cohttp"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + cohttp-lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix new file mode 100644 index 00000000000..13d55b1af21 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitLab, buildDunePackage, uri }: + +buildDunePackage rec { + pname = "resto"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "resto"; + rev = "v${version}"; + sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + uri + ]; + + # resto has infinite recursion in their tests + doCheck = false; + + meta = { + description = "A minimal OCaml library for type-safe HTTP/JSON RPCs"; + homepage = "https://gitlab.com/nomadic-labs/resto"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix new file mode 100644 index 00000000000..7539bf98ffd --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, resto, resto-json, lwt }: + +buildDunePackage { + pname = "resto-directory"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix new file mode 100644 index 00000000000..fa208cc3fbb --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, resto, resto-directory, ezresto, lwt }: + +buildDunePackage { + pname = "ezresto-directory"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + ezresto + resto-directory + resto + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/ezresto.nix b/pkgs/development/ocaml-modules/resto/ezresto.nix new file mode 100644 index 00000000000..8b3b2c6cd71 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/ezresto.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, resto, resto-json, uri }: + +buildDunePackage { + pname = "ezresto"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + uri + resto + resto-json + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix new file mode 100644 index 00000000000..e861cac6d31 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: + +buildDunePackage { + pname = "resto-json"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + json-data-encoding + json-data-encoding-bson + ]; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b12fbbd3a6..53dc64729e1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1163,6 +1163,18 @@ let reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { }; + ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { }; + + resto = callPackage ../development/ocaml-modules/resto { }; + resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { }; + resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { }; + resto-cohttp-client = callPackage ../development/ocaml-modules/resto/cohttp-client.nix { }; + resto-cohttp-self-serving-client = callPackage ../development/ocaml-modules/resto/cohttp-self-serving-client.nix { }; + resto-cohttp-server = callPackage ../development/ocaml-modules/resto/cohttp-server.nix { }; + resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { }; + resto-json = callPackage ../development/ocaml-modules/resto/json.nix { }; + rope = callPackage ../development/ocaml-modules/rope { }; routes = callPackage ../development/ocaml-modules/routes { };