From 7b40be083f4935594d14c79a1cc087af14e0b98d Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Wed, 14 Oct 2020 16:40:41 +0200
Subject: [PATCH 1/4] Rename nss to git-nss

---
 fuzz/dune                  |  4 ++--
 nss.opam => git-nss.opam   |  0
 git-unix.opam              |  2 +-
 git.opam                   |  2 +-
 src/git-cohttp-mirage/dune |  4 ++--
 src/git-cohttp-unix/dune   |  4 ++--
 src/git-cohttp/dune        |  2 +-
 src/git-unix/dune          |  4 ++--
 src/git/dune               |  8 ++++----
 src/not-so-smart/dune      | 12 ++++++------
 test/smart/dune            |  8 ++++----
 11 files changed, 25 insertions(+), 25 deletions(-)
 rename nss.opam => git-nss.opam (100%)

diff --git a/fuzz/dune b/fuzz/dune
index 0adbd33fd..e2cbffc04 100644
--- a/fuzz/dune
+++ b/fuzz/dune
@@ -11,7 +11,7 @@
 (executable
  (name smart)
  (modules smart)
- (libraries fmt crowbar digestif.c nss.smart))
+ (libraries fmt crowbar digestif.c git-nss.smart))
 
 (rule
  (alias runtest)
@@ -27,6 +27,6 @@
 
 (rule
  (alias runtest)
- (package nss)
+ (package git-nss)
  (action
   (run ./smart.exe)))
diff --git a/nss.opam b/git-nss.opam
similarity index 100%
rename from nss.opam
rename to git-nss.opam
diff --git a/git-unix.opam b/git-unix.opam
index a3371b640..e76a89e18 100644
--- a/git-unix.opam
+++ b/git-unix.opam
@@ -28,7 +28,7 @@ depends: [
   "bigarray-compat"
   "bigstringaf"
   "fmt"
-  "nss"
+  "git-nss"
   "bos"
   "fpath"
   "uri"
diff --git a/git.opam b/git.opam
index 2d558f78a..36bb1fef4 100644
--- a/git.opam
+++ b/git.opam
@@ -29,7 +29,7 @@ depends: [
   "stdlib-shims"
   "rresult"
   "result"
-  "nss"
+  "git-nss"
   "bigarray-compat"
   "bigstringaf"
   "optint"
diff --git a/src/git-cohttp-mirage/dune b/src/git-cohttp-mirage/dune
index 77295aed6..845cfc7fe 100644
--- a/src/git-cohttp-mirage/dune
+++ b/src/git-cohttp-mirage/dune
@@ -1,5 +1,5 @@
 (library
  (name git_cohttp_mirage)
  (public_name git-cohttp-mirage)
- (libraries git-cohttp lwt rresult result nss.git uri fmt cohttp cohttp-lwt
-   cohttp-mirage))
+ (libraries git-cohttp lwt rresult result git-nss.git uri fmt cohttp
+   cohttp-lwt cohttp-mirage))
diff --git a/src/git-cohttp-unix/dune b/src/git-cohttp-unix/dune
index e429dd9d6..86778e542 100644
--- a/src/git-cohttp-unix/dune
+++ b/src/git-cohttp-unix/dune
@@ -1,5 +1,5 @@
 (library
  (name git_cohttp_unix)
  (public_name git-cohttp-unix)
- (libraries git-cohttp lwt rresult result nss.git uri fmt cohttp cohttp-lwt
-   cohttp-lwt-unix))
+ (libraries git-cohttp lwt rresult result git-nss.git uri fmt cohttp
+   cohttp-lwt cohttp-lwt-unix))
diff --git a/src/git-cohttp/dune b/src/git-cohttp/dune
index 38dbf93f2..4e15e0107 100644
--- a/src/git-cohttp/dune
+++ b/src/git-cohttp/dune
@@ -1,4 +1,4 @@
 (library
  (name git_cohttp)
  (public_name git-cohttp)
- (libraries conduit lwt rresult result nss.git uri fmt cohttp cohttp-lwt))
+ (libraries conduit lwt rresult result git-nss.git uri fmt cohttp cohttp-lwt))
diff --git a/src/git-unix/dune b/src/git-unix/dune
index c4e953157..48e399e82 100644
--- a/src/git-unix/dune
+++ b/src/git-unix/dune
@@ -3,5 +3,5 @@
  (public_name git-unix)
  (modules git_unix packed_refs)
  (libraries stdlib-shims decompress.de bos astring carton conduit-lwt conduit
-   nss.smart rresult result bigarray-compat bigstringaf fmt nss.git fpath
-   digestif mmap git logs.fmt lwt lwt.unix))
+   git-nss.smart rresult result bigarray-compat bigstringaf fmt git-nss.git
+   fpath digestif mmap git logs.fmt lwt lwt.unix))
diff --git a/src/git/dune b/src/git/dune
index ef7c4cf39..193afbe31 100644
--- a/src/git/dune
+++ b/src/git/dune
@@ -1,7 +1,7 @@
 (library
  (name git)
  (public_name git)
- (libraries stdlib-shims rresult nss.sigs nss.pck bigarray-compat optint
-   loose decompress.de decompress.zl result nss.smart conduit logs lwt
-   cstruct angstrom bigstringaf carton ke fmt checkseum nss.git ocamlgraph
-   astring fpath loose_git carton-lwt carton-git digestif encore))
+ (libraries stdlib-shims rresult git-nss.sigs git-nss.pck bigarray-compat
+   optint loose decompress.de decompress.zl result git-nss.smart conduit logs
+   lwt cstruct angstrom bigstringaf carton ke fmt checkseum git-nss.git
+   ocamlgraph astring fpath loose_git carton-lwt carton-git digestif encore))
diff --git a/src/not-so-smart/dune b/src/not-so-smart/dune
index 5de505c63..4c0577d37 100644
--- a/src/not-so-smart/dune
+++ b/src/not-so-smart/dune
@@ -1,36 +1,36 @@
 (library
  (name smart)
- (public_name nss.smart)
+ (public_name git-nss.smart)
  (modules smart filter capability state protocol encoder decoder)
  (libraries conduit stdlib-shims result rresult domain-name astring fmt))
 
 (library
  (name sigs)
- (public_name nss.sigs)
+ (public_name git-nss.sigs)
  (modules sigs)
  (libraries fmt cstruct))
 
 (library
  (name neg)
- (public_name nss.neg)
+ (public_name git-nss.neg)
  (modules neg find_common default)
  (libraries stdlib-shims fmt rresult cstruct sigs logs psq smart))
 
 (library
  (name pck)
- (public_name nss.pck)
+ (public_name git-nss.pck)
  (modules pck)
  (libraries sigs psq logs smart))
 
 (library
  (name nss)
- (public_name nss)
+ (public_name git-nss)
  (modules nss fetch push)
  (libraries conduit fmt result rresult logs domain-name smart sigs neg pck))
 
 (library
  (name smart_git)
- (public_name nss.git)
+ (public_name git-nss.git)
  (modules smart_git)
  (libraries ipaddr decompress.de decompress.zl cstruct logs astring result
    rresult bigstringaf fmt emile conduit lwt domain-name uri sigs smart pck
diff --git a/test/smart/dune b/test/smart/dune
index 08a472b92..030fba177 100644
--- a/test/smart/dune
+++ b/test/smart/dune
@@ -1,14 +1,14 @@
 (executable
  (name test)
  (libraries git git-unix result curl.lwt mirage-crypto-rng.unix digestif
-   digestif.c domain-name nss.git bos fpath bigarray-compat carton-lwt
-   bigstringaf nss.sigs fmt nss.pck carton rresult conduit alcotest
-   conduit-lwt nss.smart lwt.unix mmap astring lwt cstruct uri fmt.tty
+   digestif.c domain-name git-nss.git bos fpath bigarray-compat carton-lwt
+   bigstringaf git-nss.sigs fmt git-nss.pck carton rresult conduit alcotest
+   conduit-lwt git-nss.smart lwt.unix mmap astring lwt cstruct uri fmt.tty
    logs.fmt alcotest-lwt cohttp-lwt-unix git-cohttp-unix))
 
 (rule
  (alias runtest)
- (package nss)
+ (package git-nss)
  (deps
   (:test test.exe)
   pack-testzone-0.pack

From 542c4b5d1dbd320e779d41864df5e3f3a25f6dc0 Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Thu, 15 Oct 2020 09:54:14 +0200
Subject: [PATCH 2/4] Update AppVeyor and Travis with the new name of nss

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 18904f261..306188b11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.t
 script: bash -ex .travis-opam.sh
 env:
   global:
-    - PINS="carton.dev:. carton-lwt.dev:. carton-git.dev:. nss.dev:. git.dev:. git-unix.dev:."
+    - PINS="carton.dev:. carton-lwt.dev:. carton-git.dev:. git-nss.dev:. git.dev:. git-unix.dev:."
   matrix:
     - OCAML_VERSION=4.08 PACKAGE="git.dev"
     - OCAML_VERSION=4.09 PACKAGE="git.dev"
diff --git a/appveyor.yml b/appveyor.yml
index 3f9025eab..41ae74b9d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
     FORK_BRANCH: master
     CYG_ROOT: C:\cygwin64
     OPAM_SWITCH: 4.08.1+mingw64c
-    PINS: "carton.dev:. carton-lwt.dev:. carton-git.dev:. nss.dev:. git.dev:. git-unix.dev:."
+    PINS: "carton.dev:. carton-lwt.dev:. carton-git.dev:. git-nss.dev:. git.dev:. git-unix.dev:."
   matrix:
   - PACKAGE: "git.dev"
   - PACKAGE: "git-unix.dev"

From 00e727f69dea42dcd9d4e0e4e5494d0538e4aa48 Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Thu, 15 Oct 2020 11:28:30 +0200
Subject: [PATCH 3/4] Minor fixes about git-nss and new version of cohttp
 (unrelated to the PR)

---
 git-nss.opam                    | 2 +-
 src/git-unix/ogit-fetch/dune    | 2 +-
 src/git-unix/ogit-fetch/main.ml | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/git-nss.opam b/git-nss.opam
index 402d9fd58..1fe6168a6 100644
--- a/git-nss.opam
+++ b/git-nss.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-name:         "nss"
+name:         "git-nss"
 maintainer:   "Romain Calascibetta <romain.calascibetta@gmail.com>"
 authors:      "Romain Calascibetta <romain.calascibetta@gmail.com>"
 homepage:     "https://github.com/mirage/decompress"
diff --git a/src/git-unix/ogit-fetch/dune b/src/git-unix/ogit-fetch/dune
index c25ba5e2a..972193127 100644
--- a/src/git-unix/ogit-fetch/dune
+++ b/src/git-unix/ogit-fetch/dune
@@ -3,6 +3,6 @@
  (package git-unix)
  (public_name ogit-fetch)
  (libraries git git-unix cohttp-lwt-unix conduit conduit-lwt mirage-clock
-   mirage-clock-unix awa awa-conduit nss.git fpath rresult result lwt
+   mirage-clock-unix awa awa-conduit git-nss.git fpath rresult result lwt
    lwt.unix git-cohttp-unix cmdliner mtime mtime.clock.os fmt.cli fmt.tty
    logs.cli logs.fmt))
diff --git a/src/git-unix/ogit-fetch/main.ml b/src/git-unix/ogit-fetch/main.ml
index d39907195..b56df03fc 100644
--- a/src/git-unix/ogit-fetch/main.ml
+++ b/src/git-unix/ogit-fetch/main.ml
@@ -90,10 +90,9 @@ let main (ssh_seed : string)
   let resolvers =
     let git_scheme_resolver = Conduit_lwt.TCP.resolve ~port:9418 in
     let ssh_cfg = ssh_cfg repository ssh_seed in
-    Cohttp_lwt_unix.Net.empty
+    Conduit.empty
     |> Conduit_lwt.add Conduit_lwt.TCP.protocol git_scheme_resolver
     |> Conduit_lwt.add ssh_protocol (ssh_resolve @@ Option.get ssh_cfg)
-    (* FIXME add support for SSH *)
   in
   Store.v repo_root >>!= store_err >>?= fun store ->
   let push_stdout = print_endline in

From ed7570225534a4428102bc300a7928e267d7db06 Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Thu, 15 Oct 2020 12:02:45 +0200
Subject: [PATCH 4/4] Fix git-cohttp package (depends on cohttp-lwt)

---
 git-cohttp.opam | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git-cohttp.opam b/git-cohttp.opam
index 9e65b0809..a8dc8fac1 100644
--- a/git-cohttp.opam
+++ b/git-cohttp.opam
@@ -19,6 +19,8 @@ depends: [
   "ocaml"             {>= "4.07.0"}
   "dune"              {>= "2.6.0"}
   "git"
+  "cohttp"
+  "cohttp-lwt"
 ]
 
 pin-depends: [