From cdd2b7902677e7d66fdd5d24569f313a2b38fb05 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 3 Jun 2022 02:13:40 -0400
Subject: [PATCH 1/4] build: secrets optional

---
 .github/workflows/vere.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/vere.yml b/.github/workflows/vere.yml
index 9c1a0693ec..8118f859f9 100644
--- a/.github/workflows/vere.yml
+++ b/.github/workflows/vere.yml
@@ -16,11 +16,11 @@ on:
         required: false
     secrets:
       CACHIX_AUTH_TOKEN:
-        required: true
+        required: false
       GCS_SERVICE_ACCOUNT_KEY:
-        required: true
+        required: false
       GCS_PROJECT:
-        required: true
+        required: false
 
   workflow_dispatch:
     inputs:

From ace6ca12ff5d7088ff9c31049dd7cf86122a9336 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 3 Jun 2022 02:18:02 -0400
Subject: [PATCH 2/4] vere: adds --no-dock to usage printf

---
 pkg/urbit/daemon/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/urbit/daemon/main.c b/pkg/urbit/daemon/main.c
index c91576fd98..03dc17018f 100644
--- a/pkg/urbit/daemon/main.c
+++ b/pkg/urbit/daemon/main.c
@@ -681,6 +681,7 @@ u3_ve_usage(c3_i argc, c3_c** argv)
     "-Y, --scry-into FILE          Optional name of file (for -X)\n",
     "-Z, --scry-format FORMAT      Optional file format ('jam', or aura, for -X)\n",
     "    --no-conn                 Do not run control plane\n",
+    "    --no-dock                 Skip binary \"docking\" on boot\n",
     "\n",
     "Development Usage:\n",
     "   To create a development ship, use a fakezod:\n",

From 0018d2c33b37e69f830ad66dbc77bdb566cb2ef5 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 3 Jun 2022 12:58:41 -0400
Subject: [PATCH 3/4] build: removes herb from top-level Makefile, shell.nix

---
 Makefile  | 4 ++--
 shell.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a06eac1c8a..dbadd5cd71 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 .PHONY: build build-all install cross release test pills ropsten-pills clean
 
 build:
-	nix-build -A urbit -A herb --no-out-link
+	nix-build -A urbit --no-out-link
 
 install:
-	nix-env -f . -iA urbit -iA herb
+	nix-env -f . -iA urbit
 
 release:
 	sh/release
diff --git a/shell.nix b/shell.nix
index b1858df930..c6d03692ae 100644
--- a/shell.nix
+++ b/shell.nix
@@ -22,7 +22,7 @@ let
   #
   # Typically the inputs listed here also have a shell.nix in their respective
   # source directory you can use directly.
-  inputsFrom = with pkgsLocal; [ ent herb urbit urcrypt ];
+  inputsFrom = with pkgsLocal; [ ent urbit urcrypt ];
 
   # Collect the named attribute from all dependencies listed in inputsFrom.
   mergeFrom = name: pkgs.lib.concatLists (pkgs.lib.catAttrs name inputsFrom);

From e3f688297fc1bc30cc5eeb76773efebe4cf6ee75 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 3 Jun 2022 13:01:36 -0400
Subject: [PATCH 4/4] vere: fix -Y (should not be resolved)

---
 pkg/urbit/daemon/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/urbit/daemon/main.c b/pkg/urbit/daemon/main.c
index 03dc17018f..fffb762623 100644
--- a/pkg/urbit/daemon/main.c
+++ b/pkg/urbit/daemon/main.c
@@ -251,7 +251,7 @@ _main_getopt(c3_i argc, c3_c** argv)
         break;
       }
       case 'Y': {
-        u3_Host.ops_u.puk_c = _main_repath(optarg);
+        u3_Host.ops_u.puk_c = strdup(optarg);
         break;
       }
       case 'Z': {