ocamlPackages.resto: 0.6.1 -> 0.7

2 years ago · d27cc392f0
parent c356e7246f
commit d27cc392f0
11 changed files with 10 additions and 40 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
  ];
--- 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
--- a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix
+++ b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix
@ -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
-  ];
-}
--- a/pkgs/development/ocaml-modules/resto/ezresto.nix
+++ b/pkgs/development/ocaml-modules/resto/ezresto.nix
@ -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
-  ];
-}
--- 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
--- 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 { };