From be67eb0d5c7fcd482b78f0588f344c4b88e83046 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 26 Aug 2025 08:18:39 +0200 Subject: [PATCH] ocamlPackages.resto: remove at 1.2 --- pkgs/development/ocaml-modules/resto/acl.nix | 23 ------------- .../ocaml-modules/resto/cohttp-client.nix | 27 --------------- .../resto/cohttp-self-serving-client.nix | 33 ------------------- .../ocaml-modules/resto/cohttp-server.nix | 31 ----------------- .../ocaml-modules/resto/cohttp.nix | 23 ------------- .../ocaml-modules/resto/default.nix | 32 ------------------ .../ocaml-modules/resto/directory.nix | 21 ------------ pkgs/development/ocaml-modules/resto/json.nix | 23 ------------- pkgs/top-level/ocaml-packages.nix | 11 ------- 9 files changed, 224 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/resto/acl.nix delete mode 100644 pkgs/development/ocaml-modules/resto/cohttp-client.nix delete mode 100644 pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix delete mode 100644 pkgs/development/ocaml-modules/resto/cohttp-server.nix delete mode 100644 pkgs/development/ocaml-modules/resto/cohttp.nix delete mode 100644 pkgs/development/ocaml-modules/resto/default.nix delete mode 100644 pkgs/development/ocaml-modules/resto/directory.nix delete 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 deleted file mode 100644 index c247cac6f73a..000000000000 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - buildDunePackage, - resto, - uri, -}: - -buildDunePackage { - pname = "resto-acl"; - inherit (resto) - src - version - meta - doCheck - ; - - minimalOCamlVersion = "4.10"; - duneVersion = "3"; - - propagatedBuildInputs = [ - resto - uri - ]; -} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix deleted file mode 100644 index df11a7b585ae..000000000000 --- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - buildDunePackage, - resto, - resto-directory, - resto-cohttp, - uri, - lwt, -}: - -buildDunePackage { - pname = "resto-cohttp-client"; - inherit (resto) - src - version - meta - doCheck - ; - duneVersion = "3"; - - 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 deleted file mode 100644 index b632c348e31c..000000000000 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - 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 - doCheck - ; - duneVersion = "3"; - - 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 deleted file mode 100644 index 0a1bb0945f3a..000000000000 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - 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 - doCheck - ; - duneVersion = "3"; - - 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 deleted file mode 100644 index 87b82ecee1ad..000000000000 --- a/pkgs/development/ocaml-modules/resto/cohttp.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - buildDunePackage, - resto, - resto-directory, - cohttp-lwt, -}: - -buildDunePackage { - pname = "resto-cohttp"; - inherit (resto) - src - version - meta - doCheck - ; - duneVersion = "3"; - - propagatedBuildInputs = [ - resto - resto-directory - cohttp-lwt - ]; -} diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix deleted file mode 100644 index 5018a282e59e..000000000000 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - fetchFromGitLab, - buildDunePackage, - uri, -}: - -buildDunePackage rec { - pname = "resto"; - version = "1.2"; - duneVersion = "3"; - src = fetchFromGitLab { - owner = "nomadic-labs"; - repo = "resto"; - rev = "v${version}"; - hash = "sha256-VdkYUy7Fi53ku6F/1FV55/VcyF/tDZKN4NTMabDd/T4="; - }; - - propagatedBuildInputs = [ - uri - ]; - - # resto has infinite recursion in their tests - doCheck = false; - - meta = { - description = "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 deleted file mode 100644 index 187248fcc2d8..000000000000 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - buildDunePackage, - resto, - lwt, -}: - -buildDunePackage { - pname = "resto-directory"; - inherit (resto) - src - version - meta - doCheck - ; - duneVersion = "3"; - - propagatedBuildInputs = [ - resto - lwt - ]; -} diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix deleted file mode 100644 index 313acf870462..000000000000 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - buildDunePackage, - resto, - json-data-encoding, - json-data-encoding-bson, -}: - -buildDunePackage { - pname = "resto-json"; - inherit (resto) - src - version - meta - doCheck - ; - duneVersion = "3"; - - 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 37c4a51e1878..f025e1cfd9f6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1833,17 +1833,6 @@ let resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; - 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 { }; - result = callPackage ../development/ocaml-modules/ocaml-result { }; rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { };