From d27cc392f04381074e5c71a2d5356442b1610cac Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 31 May 2022 09:14:43 +0200 Subject: [PATCH] ocamlPackages.resto: 0.6.1 -> 0.7 --- pkgs/development/ocaml-modules/resto/acl.nix | 4 ++-- .../ocaml-modules/resto/cohttp-client.nix | 2 +- .../resto/cohttp-self-serving-client.nix | 2 +- .../ocaml-modules/resto/cohttp-server.nix | 2 +- pkgs/development/ocaml-modules/resto/cohttp.nix | 2 +- pkgs/development/ocaml-modules/resto/default.nix | 6 ++---- pkgs/development/ocaml-modules/resto/directory.nix | 2 +- .../ocaml-modules/resto/ezresto-directory.nix | 13 ------------- pkgs/development/ocaml-modules/resto/ezresto.nix | 12 ------------ pkgs/development/ocaml-modules/resto/json.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 3 --- 11 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/resto/ezresto-directory.nix delete mode 100644 pkgs/development/ocaml-modules/resto/ezresto.nix diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 7ac05cd62da..0eed996289d 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -2,9 +2,9 @@ buildDunePackage { pname = "resto-acl"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; - minimalOCamlVersion = "4.05"; + minimalOCamlVersion = "4.10"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix index 2dc651045ba..dd0db02cdd5 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "resto-cohttp-client"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index 88f2ef25e6a..c01fb1db905 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -12,7 +12,7 @@ buildDunePackage { pname = "resto-cohttp-self-serving-client"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 61a5d93e9fc..29e18aa88b1 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "resto-cohttp-server"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix index c29e589057c..4de70b1dfef 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "resto-cohttp"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 13d55b1af21..14a295e2769 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -2,16 +2,14 @@ buildDunePackage rec { pname = "resto"; - version = "0.6.1"; + version = "0.7"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87"; + sha256 = "sha256-aX7w/rsoOmbni8BOXa0WnoQ47Y5zl91vWvMobuNFT3Y="; }; - useDune2 = true; - propagatedBuildInputs = [ uri ]; diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index 7539bf98ffd..555ec590ffd 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "resto-directory"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix deleted file mode 100644 index fa208cc3fbb..00000000000 --- a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ 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 deleted file mode 100644 index 8b3b2c6cd71..00000000000 --- a/pkgs/development/ocaml-modules/resto/ezresto.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ 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 index e861cac6d31..dbb81fd35a6 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "resto-json"; - inherit (resto) src version meta useDune2 doCheck; + inherit (resto) src version meta doCheck; propagatedBuildInputs = [ resto diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 546c37149f7..53ede51c4cc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1293,9 +1293,6 @@ let rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; - 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 { };