Merge branch 'master' of github.com:anmonteiro/httpaf

anmonteiro · Aug 6, 2024 · 8c2b051 · 8c2b051
2 parents 18b2d15 + 9b230ee
commit 8c2b051
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 17 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,6 +16,12 @@
       rec {
         packages = pkgs.callPackage ./nix { nix-filter = nix-filter.lib; };
         defaultPackage = packages.httpun;
-        devShell = pkgs.callPackage ./shell.nix { inherit packages; };
+        devShells = {
+          default = pkgs.callPackage ./nix/shell.nix { inherit packages; };
+          release = pkgs.callPackage ./nix/shell.nix {
+            inherit packages;
+            release-mode = true;
+          };
+        };
       });
 }
diff --git a/httpun-async.opam b/httpun-async.opam
@@ -1,5 +1,4 @@
 opam-version: "2.0"
-name: "httpun-async"
 maintainer: "Antonio Nuno Monteiro <[email protected]>"
 authors: [
   "Spiros Eliopoulos <[email protected]>"
@@ -16,7 +15,6 @@ build: [
 depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "3.0.0"}
-  "faraday-async" {>= "0.7.2"}
   "async" {>= "v0.16.0"}
   "httpun" {= version}
   "gluten-async" {>= "0.5.0"}

diff --git a/httpun-eio.opam b/httpun-eio.opam
@@ -1,5 +1,4 @@
 opam-version: "2.0"
-name: "httpun-eio"
 maintainer: "Antonio Monteiro <[email protected]>"
 authors: [ "Antonio Monteiro <[email protected]>" ]
 license: "BSD-3-clause"

diff --git a/httpun-lwt-unix.opam b/httpun-lwt-unix.opam
@@ -1,5 +1,4 @@
 opam-version: "2.0"
-name: "httpun-lwt-unix"
 maintainer: "Antonio Nuno Monteiro <[email protected]>"
 authors: [
   "Anton Bachin <[email protected]>"

diff --git a/httpun-lwt.opam b/httpun-lwt.opam
@@ -1,5 +1,4 @@
 opam-version: "2.0"
-name: "httpun-lwt"
 maintainer: "Antonio Nuno Monteiro <[email protected]>"
 authors: [
   "Anton Bachin <[email protected]>"

diff --git a/httpun-mirage.opam b/httpun-mirage.opam
@@ -12,7 +12,7 @@ build: [
 depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "3.0.0"}
-  "httpun" {= version}
+  "httpun-lwt" {= version}
   "gluten-mirage" {>= "0.5.0"}
   "mirage-flow" {>= "2.0.0"}
   "cstruct"

diff --git a/lib_test/dune b/lib_test/dune
@@ -1,4 +1,5 @@
 (test
+ (package httpun)
  (libraries bigstringaf httpun alcotest)
  (modules
   helpers

diff --git a/shell.nix → nix/shell.nix b/shell.nix → nix/shell.nix
@@ -1,14 +1,25 @@
-{ pkgs, stdenv, lib }:
+{ pkgs
+, packages
+, stdenv
+, lib
+, release-mode ? false
+}:
 
 let
-  httpunPkgs = pkgs.recurseIntoAttrs (import ./nix { inherit pkgs; doCheck = false; });
-  httpunDrvs = lib.filterAttrs (_: value: lib.isDerivation value) httpunPkgs;
+  httpunDrvs = lib.filterAttrs (_: value: lib.isDerivation value) packages;
 
 in
 with pkgs;
 
 (mkShell {
   OCAMLRUNPARAM = "b";
+  nativeBuildInputs =
+    lib.optionals release-mode [
+      cacert
+      curl
+      ocamlPackages.dune-release
+      git
+    ];
   inputsFrom = lib.attrValues httpunDrvs;
   buildInputs = with ocamlPackages; [ merlin utop ];
 }).overrideAttrs (o: {