mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-11-28 11:40:11 +03:00
Revert "Merge branch 'jt/urbit-large-log' (#2211)"
This reverts commit0fc9056074
, reversing changes made to1e3a1434e0
. The changes made here evidently broke builds on some Linux variants.
This commit is contained in:
parent
0fc9056074
commit
1daaf041a7
@ -24,13 +24,6 @@ let
|
|||||||
urbit = mkUrbit { debug = false; };
|
urbit = mkUrbit { debug = false; };
|
||||||
urbit-debug = mkUrbit { debug = true; };
|
urbit-debug = mkUrbit { debug = true; };
|
||||||
|
|
||||||
urbit-large-log = pkgs.stdenv.lib.overrideDerivation urbit (_: {
|
|
||||||
patches = [ ./urbit/patches/large-log-limit.patch ];
|
|
||||||
patchFlags = "-p3";
|
|
||||||
});
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{ inherit ent ge-additions arvo arvo-ropsten herb;
|
{ inherit ent ge-additions arvo arvo-ropsten herb urbit urbit-debug; }
|
||||||
inherit urbit urbit-debug urbit-large-log;
|
|
||||||
}
|
|
||||||
|
15
nix/pkgs/urbit/builder.sh
Normal file
15
nix/pkgs/urbit/builder.sh
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
source $stdenv/setup
|
||||||
|
|
||||||
|
cp -r $src ./src
|
||||||
|
chmod -R u+w ./src
|
||||||
|
cd src
|
||||||
|
|
||||||
|
bash ./configure
|
||||||
|
|
||||||
|
make clean
|
||||||
|
make all -j8
|
||||||
|
make test
|
||||||
|
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ./build/urbit $out/bin/$exename
|
||||||
|
cp ./build/urbit-worker $out/bin/$exename-worker
|
@ -27,17 +27,9 @@ let
|
|||||||
inherit name meta;
|
inherit name meta;
|
||||||
exename = name;
|
exename = name;
|
||||||
src = ../../../pkg/urbit;
|
src = ../../../pkg/urbit;
|
||||||
|
builder = ./builder.sh;
|
||||||
nativeBuildInputs = deps ++ vendor;
|
nativeBuildInputs = deps ++ vendor;
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
make all -j8
|
|
||||||
make test
|
|
||||||
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp ./build/urbit $out/bin/$exename
|
|
||||||
cp ./build/urbit-worker $out/bin/$exename-worker
|
|
||||||
'';
|
|
||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/18995
|
# See https://github.com/NixOS/nixpkgs/issues/18995
|
||||||
hardeningDisable = if debug then [ "all" ] else [];
|
hardeningDisable = if debug then [ "all" ] else [];
|
||||||
|
|
||||||
|
@ -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;
|
|
Loading…
Reference in New Issue
Block a user