Merge pull request #631 from psafont/private/paus/unpatched-conduit

xapi-project · Feb 22, 2023 · 19a0ce5 · 19a0ce5
2 parents 22c3c0c + aa392bd
commit 19a0ce5
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 832 deletions.
diff --git a/.../conduit-async.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch b/.../conduit-async.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
diff --git a/packages/upstream/conduit-async.2.2.2-1/opam → packages/upstream/conduit-async.2.2.2/opam b/packages/upstream/conduit-async.2.2.2-1/opam → packages/upstream/conduit-async.2.2.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-async"
-version: "2.2.2-1"
+version: "2.2.2"
 synopsis: "A network connection establishment library for Async"
 maintainer: "[email protected]"
 authors: [
@@ -28,12 +28,7 @@ build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-patches: "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
-extra-files: [
-  "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
-  "md5=c131b837c73db9cd31687fbbdf7e027f"
-]
 url {
   src:
     "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"