From 8fac63661f1f64d80c95e5ed2aa5bf6c6998ffe1 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Thu, 11 Jun 2020 19:25:37 -0700 Subject: [PATCH] vere: removes ncurses dependency --- nix/deps-env.nix | 2 +- nix/pkgs/urbit/default.nix | 2 +- nix/pkgs/urbit/release.nix | 3 +-- nix/pkgs/urbit/release.sh | 1 - nix/release.nix | 2 +- pkg/urbit/configure | 2 +- pkg/urbit/daemon/main.c | 9 --------- pkg/urbit/vere/ames.c | 3 --- pkg/urbit/vere/behn.c | 3 --- pkg/urbit/vere/foil.c | 2 -- pkg/urbit/vere/fore.c | 3 --- pkg/urbit/vere/hind.c | 3 --- pkg/urbit/vere/newt.c | 3 --- pkg/urbit/vere/term.c | 2 -- pkg/urbit/vere/time.c | 3 --- pkg/urbit/vere/unix.c | 2 -- pkg/urbit/vere/walk.c | 3 --- pkg/urbit/worker/serf.c | 3 --- sh/cross | 3 --- 19 files changed, 5 insertions(+), 49 deletions(-) diff --git a/nix/deps-env.nix b/nix/deps-env.nix index cd945bceb..77a7d8bac 100644 --- a/nix/deps-env.nix +++ b/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; diff --git a/nix/pkgs/urbit/default.nix b/nix/pkgs/urbit/default.nix index ada88ba96..3843be6bc 100644 --- a/nix/pkgs/urbit/default.nix +++ b/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 ]; diff --git a/nix/pkgs/urbit/release.nix b/nix/pkgs/urbit/release.nix index b42bbc8cf..40517aba8 100644 --- a/nix/pkgs/urbit/release.nix +++ b/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; diff --git a/nix/pkgs/urbit/release.sh b/nix/pkgs/urbit/release.sh index 76b35040a..4bff817e4 100644 --- a/nix/pkgs/urbit/release.sh +++ b/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 diff --git a/nix/release.nix b/nix/release.nix index f71589ea9..2ccd1098b 100644 --- a/nix/release.nix +++ b/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; diff --git a/pkg/urbit/configure b/pkg/urbit/configure index ebf59d23d..90e863463 100755 --- a/pkg/urbit/configure +++ b/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=" \ diff --git a/pkg/urbit/daemon/main.c b/pkg/urbit/daemon/main.c index 17de3f5f7..518946844 100644 --- a/pkg/urbit/daemon/main.c +++ b/pkg/urbit/daemon/main.c @@ -9,9 +9,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -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(); } diff --git a/pkg/urbit/vere/ames.c b/pkg/urbit/vere/ames.c index ce6be2ee0..59e306616 100644 --- a/pkg/urbit/vere/ames.c +++ b/pkg/urbit/vere/ames.c @@ -9,9 +9,6 @@ #include #include #include -#include -#include -#include #include "all.h" #include "vere/vere.h" diff --git a/pkg/urbit/vere/behn.c b/pkg/urbit/vere/behn.c index eed3bfb10..3d09f2ef1 100644 --- a/pkg/urbit/vere/behn.c +++ b/pkg/urbit/vere/behn.c @@ -6,9 +6,6 @@ #include #include #include -#include -#include -#include #include #include "all.h" diff --git a/pkg/urbit/vere/foil.c b/pkg/urbit/vere/foil.c index 4bd4a401a..b6647eb40 100644 --- a/pkg/urbit/vere/foil.c +++ b/pkg/urbit/vere/foil.c @@ -16,8 +16,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/pkg/urbit/vere/fore.c b/pkg/urbit/vere/fore.c index 3666360a9..5cbac0144 100644 --- a/pkg/urbit/vere/fore.c +++ b/pkg/urbit/vere/fore.c @@ -6,9 +6,6 @@ #include #include #include -#include -#include -#include #include #include "all.h" diff --git a/pkg/urbit/vere/hind.c b/pkg/urbit/vere/hind.c index 342c7d33d..082a718ee 100644 --- a/pkg/urbit/vere/hind.c +++ b/pkg/urbit/vere/hind.c @@ -6,9 +6,6 @@ #include #include #include -#include -#include -#include #include #include "all.h" diff --git a/pkg/urbit/vere/newt.c b/pkg/urbit/vere/newt.c index 62ff6a218..93b343213 100644 --- a/pkg/urbit/vere/newt.c +++ b/pkg/urbit/vere/newt.c @@ -24,9 +24,6 @@ #include #include #include -#include -#include -#include #include "all.h" #include "vere/vere.h" diff --git a/pkg/urbit/vere/term.c b/pkg/urbit/vere/term.c index a81180cfe..9e30f3b23 100644 --- a/pkg/urbit/vere/term.c +++ b/pkg/urbit/vere/term.c @@ -8,9 +8,7 @@ #include #include #include -#include #include -#include #include "all.h" #include "vere/vere.h" diff --git a/pkg/urbit/vere/time.c b/pkg/urbit/vere/time.c index 2a36cf822..e67046ba2 100644 --- a/pkg/urbit/vere/time.c +++ b/pkg/urbit/vere/time.c @@ -6,9 +6,6 @@ #include #include #include -#include -#include -#include #include "all.h" #include "vere/vere.h" diff --git a/pkg/urbit/vere/unix.c b/pkg/urbit/vere/unix.c index 381c7376c..77d3d9f0e 100644 --- a/pkg/urbit/vere/unix.c +++ b/pkg/urbit/vere/unix.c @@ -7,8 +7,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/pkg/urbit/vere/walk.c b/pkg/urbit/vere/walk.c index 1456d9aa8..5ed14b016 100644 --- a/pkg/urbit/vere/walk.c +++ b/pkg/urbit/vere/walk.c @@ -6,9 +6,6 @@ #include #include #include -#include -#include -#include #include #include "all.h" diff --git a/pkg/urbit/worker/serf.c b/pkg/urbit/worker/serf.c index 0c0f6fd11..8cb088efd 100644 --- a/pkg/urbit/worker/serf.c +++ b/pkg/urbit/worker/serf.c @@ -15,9 +15,6 @@ #include #include #include -#include -#include -#include #include "all.h" #include diff --git a/sh/cross b/sh/cross index c2f7f12e9..28d1aa877 100755 --- a/sh/cross +++ b/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