diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 47d8f3fb86..2f29144a7b 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -24,16 +24,6 @@ let urbit = mkUrbit { debug = false; }; urbit-debug = mkUrbit { debug = true; }; - urbit-large-log = pkgs.stdenv.lib.overrideDerivation urbit (_: { - patches = [ - ./urbit/patches/large-log-limit.patch - ./urbit/patches/vere-version-label.patch - ]; - patchFlags = "-p3"; - }); - in -{ inherit ent ge-additions arvo arvo-ropsten herb; - inherit urbit urbit-debug urbit-large-log; -} +{ inherit ent ge-additions arvo arvo-ropsten herb urbit urbit-debug; } diff --git a/nix/pkgs/urbit/patches/large-log-limit.patch b/nix/pkgs/urbit/patches/large-log-limit.patch deleted file mode 100644 index 7d88d0d52d..0000000000 --- a/nix/pkgs/urbit/patches/large-log-limit.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkg/urbit/vere/lmdb.c b/pkg/urbit/vere/lmdb.c -index b46cc66ee..b8f647dde 100644 ---- a/pkg/urbit/vere/lmdb.c -+++ b/pkg/urbit/vere/lmdb.c -@@ -44,8 +44,8 @@ MDB_env* u3_lmdb_init(const char* log_path) - // TODO: Start with forty gigabytes for the maximum event log size. We'll - // need to do something more sophisticated for real in the long term, though. - // -- const size_t forty_gigabytes = 42949672960; -- ret_w = mdb_env_set_mapsize(env, forty_gigabytes); -+ const size_t sixty_gigabytes = 64424509440; -+ ret_w = mdb_env_set_mapsize(env, sixty_gigabytes); - if (ret_w != 0) { - u3l_log("lmdb: failed to set database size: %s\n", mdb_strerror(ret_w)); - return 0; diff --git a/nix/pkgs/urbit/patches/vere-version-label.patch b/nix/pkgs/urbit/patches/vere-version-label.patch deleted file mode 100644 index 7b1778b488..0000000000 --- a/nix/pkgs/urbit/patches/vere-version-label.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/urbit/configure b/pkg/urbit/configure -index f2fddfdd6..07be9d589 100755 ---- a/pkg/urbit/configure -+++ b/pkg/urbit/configure -@@ -19,6 +19,8 @@ defmacro () { - echo "#define $1 $2" >>include/config.h - } - -+URBIT_VERSION="$URBIT_VERSION-llog" -+ - defmacro URBIT_VERSION "\"$URBIT_VERSION\"" - - [ -n "$MEMORY_DEBUG" ] && defmacro U3_MEMORY_DEBUG 1