prep for 0.6.1 (#128)

anmonteiro · May 17, 2020 · 8a88101 · 8a88101
1 parent 9440e21
commit 8a88101
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 Unreleased
 ---------------
+
+0.6.1 2020-05-16
+---------------
 - h2-async: add Async adapter
   ([#94](https://github.com/anmonteiro/ocaml-h2/pull/94))
 - h2-async: Use [gluten](https://github.com/anmonteiro/gluten) to implement
@@ -9,7 +12,6 @@ Unreleased
 - h2: Don't put parser in error state when force-closing
   ([#127](https://github.com/anmonteiro/ocaml-h2/pull/127))
 
-
 0.6.0 2020-04-29
 --------------
 

diff --git a/h2-async.opam b/h2-async.opam
@@ -14,6 +14,7 @@ depends: [
   "dune" {>= "1.7"}
   "faraday-async"
   "async"
+  "gluten-async"
   "h2" {= version}
 ]
 depopts: ["async_ssl"]

diff --git a/h2-lwt-unix.opam b/h2-lwt-unix.opam
@@ -15,7 +15,7 @@ depends: [
   "h2-lwt" {= version}
   "dune" {>= "1.7"}
   "lwt"
-  "gluten-lwt-unix" {> "0.2.0"}
+  "gluten-lwt-unix" {>= "0.2.1"}
 ]
 depopts: [
   "tls"

diff --git a/h2-lwt.opam b/h2-lwt.opam
@@ -14,7 +14,7 @@ depends: [
   "h2" {= version}
   "dune" {>= "1.7"}
   "lwt"
-  "gluten-lwt" {>= "0.2.0"}
+  "gluten-lwt" {>= "0.2.1"}
 ]
 synopsis: "Lwt support for h2"
 description: """

diff --git a/nix/sources.nix b/nix/sources.nix
@@ -3,7 +3,7 @@
 let
   overlays =
     builtins.fetchTarball
-      https://github.com/anmonteiro/nix-overlays/archive/af504f1.tar.gz;
+      https://github.com/anmonteiro/nix-overlays/archive/cd81f24f.tar.gz;
 
 in
 

diff --git a/shell.nix b/shell.nix
@@ -1,3 +1,4 @@
+{ release-mode ? false }:
 
 let
   pkgs = import ./nix/sources.nix {};
@@ -6,9 +7,18 @@ let
   h2Drvs = lib.filterAttrs (_: value: lib.isDerivation value) h2Pkgs;
 
 in
-  (pkgs.mkShell {
+  with pkgs;
+  (mkShell {
     inputsFrom = lib.attrValues h2Drvs;
-    buildInputs = with pkgs.ocamlPackages; [ merlin pkgs.ocamlformat ];
+    buildInputs =
+      (if release-mode then [
+        cacert
+        curl
+        ocamlPackages.dune-release
+        git
+        opam
+      ] else [])
+      ++ (with ocamlPackages; [ merlin ocamlformat ]);
   }).overrideAttrs (o : {
     propagatedBuildInputs = lib.filter
       (drv: drv.pname == null || !(lib.any (name: name == drv.pname) (lib.attrNames h2Drvs)))