vere: removes ncurses dependency

nix/deps-env.nix

@@ -10,7 +10,7 @@ let
 
   libs =
     with pkgs;
-    [ openssl zlib curl gmp scrypt libsigsegv ncurses openssl zlib lmdb ];
+    [ openssl zlib curl gmp scrypt libsigsegv openssl zlib lmdb ];
 
   osx =
     with pkgs;

nix/pkgs/urbit/default.nix

@@ -18,7 +18,7 @@ let
 
   deps =
     with pkgs;
-    [ curl gmp libsigsegv ncurses openssl zlib lmdb ];
+    [ curl gmp libsigsegv openssl zlib lmdb ];
 
   vendor =
     [ argon2 softfloat3 ed25519 ent ge-additions libaes_siv h2o scrypt uv murmur3 secp256k1 sni ivory-header ca-header ];

nix/pkgs/urbit/release.nix

@@ -12,7 +12,7 @@ let
 
   crossdeps =
     with env;
-    [ curl libgmp libsigsegv ncurses openssl zlib lmdb ];
+    [ curl libgmp libsigsegv openssl zlib lmdb ];
 
   vendor =
     with deps;
@@ -27,7 +27,6 @@ env.make_derivation {
   MEMORY_DEBUG     = debug;
   CPU_DEBUG        = debug;
   EVENT_TIME_DEBUG = false;
-  NCURSES          = env.ncurses;
 
   name              = "${name}-${env_name}";
   exename           = name;

nix/pkgs/urbit/release.sh

@@ -17,6 +17,5 @@ bash ./configure
 make build/urbit build/urbit-worker -j8
 
 mkdir -p $out/bin
-cp -r $NCURSES/share/terminfo $out/bin/$exename-terminfo
 cp ./build/urbit              $out/bin/$exename
 cp ./build/urbit-worker       $out/bin/$exename-worker

nix/release.nix

@@ -33,7 +33,7 @@ let
 
   builds-for-platform = plat:
     plat.deps // {
-      inherit (plat.env) curl libgmp libsigsegv ncurses openssl zlib lmdb;
+      inherit (plat.env) curl libgmp libsigsegv openssl zlib lmdb;
       inherit (plat.env) cmake_toolchain;
       ent          = ent          plat;
       ge-additions = ge-additions plat;

pkg/urbit/configure

@@ -6,7 +6,7 @@ URBIT_VERSION="0.10.5"
 
 deps="                                                                    \
   curl gmp sigsegv argon2 ed25519 ent h2o scrypt sni uv murmur3 secp256k1 \
-  softfloat3 ncurses ssl crypto z lmdb ge-additions aes_siv               \
+  softfloat3 ssl crypto z lmdb ge-additions aes_siv                       \
 "
 
 headers="             \

pkg/urbit/daemon/main.c

@@ -9,9 +9,7 @@
 #include <uv.h>
 #include <sigsegv.h>
 #include <stdlib.h>
-#include <ncurses/curses.h>
 #include <termios.h>
-#include <ncurses/term.h>
 #include <dirent.h>
 #include <openssl/conf.h>
 #include <openssl/engine.h>
@@ -451,7 +449,6 @@ report(void)
          (libsigsegv_version >> 8) & 0xff,
          libsigsegv_version & 0xff);
   printf("openssl: %s\n", SSLeay_version(SSLEAY_VERSION));
-  printf("curses: %s\n", curses_version());
   printf("libuv: %s\n", uv_version_string());
   printf("libh2o: %d.%d.%d\n",
          H2O_LIBRARY_VERSION_MAJOR,
@@ -603,12 +600,6 @@ main(c3_i   argc,
   u3_Host.wrk_c = c3_malloc(worker_exe_len);
   snprintf(u3_Host.wrk_c, worker_exe_len, "%s-worker", argv[0]);
 
-  // Set TERMINFO_DIRS environment variable
-  c3_i terminfo_len = 1 + strlen(argv[0]) + strlen("-terminfo");
-  c3_c terminfo_dir[terminfo_len];
-  snprintf(terminfo_dir, terminfo_len, "%s-terminfo", argv[0]);
-  setenv("TERMINFO_DIRS", terminfo_dir, 1);
-
   if ( c3y == u3_Host.ops_u.dem ) {
     _fork_into_background_process();
   }

pkg/urbit/vere/ames.c

@@ -9,9 +9,6 @@
 #include <netdb.h>
 #include <uv.h>
 #include <errno.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 
 #include "all.h"
 #include "vere/vere.h"

pkg/urbit/vere/behn.c

@@ -6,9 +6,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <uv.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 #include <errno.h>
 
 #include "all.h"

pkg/urbit/vere/foil.c

@@ -16,8 +16,6 @@
 #include <dirent.h>
 #include <stdint.h>
 #include <uv.h>
-#include <termios.h>
-#include <ncurses/term.h>
 #include <errno.h>
 #include <libgen.h>
 #include <ftw.h>

pkg/urbit/vere/fore.c

@@ -6,9 +6,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <uv.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 #include <errno.h>
 
 #include "all.h"

pkg/urbit/vere/hind.c

@@ -6,9 +6,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <uv.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 #include <errno.h>
 
 #include "all.h"

pkg/urbit/vere/newt.c

@@ -24,9 +24,6 @@
 #include <netinet/in.h>
 #include <uv.h>
 #include <errno.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 
 #include "all.h"
 #include "vere/vere.h"

pkg/urbit/vere/term.c

@@ -8,9 +8,7 @@
 #include <netinet/in.h>
 #include <uv.h>
 #include <errno.h>
-#include <ncurses/curses.h>
 #include <termios.h>
-#include <ncurses/term.h>
 
 #include "all.h"
 #include "vere/vere.h"

pkg/urbit/vere/time.c

@@ -6,9 +6,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <uv.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 
 #include "all.h"
 #include "vere/vere.h"

pkg/urbit/vere/unix.c

@@ -7,8 +7,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <uv.h>
-#include <termios.h>
-#include <ncurses/term.h>
 #include <errno.h>
 #include <libgen.h>
 #include <ftw.h>

pkg/urbit/vere/walk.c

@@ -6,9 +6,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <uv.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 #include <errno.h>
 
 #include "all.h"

pkg/urbit/worker/serf.c

@@ -15,9 +15,6 @@
 #include <netinet/in.h>
 #include <uv.h>
 #include <errno.h>
-#include <ncurses/curses.h>
-#include <termios.h>
-#include <ncurses/term.h>
 
 #include "all.h"
 #include <vere/vere.h>

sh/cross

@@ -26,6 +26,3 @@ res=$(release "$env.$pkg")
 mkdir -p ./cross/$env
 traced cp -f $res/bin/$pkg ./cross/$env/$pkg
 traced cp -f $res/bin/$pkg-worker ./cross/$env/$pkg-worker
-traced cp -r $res/bin/$pkg-terminfo ./cross/$env/$pkg-terminfo
-
-chmod -R u+wr ./cross/$env/$pkg-terminfo