From 0a4fbef175707fe026252073e4d13cf0beb09201 Mon Sep 17 00:00:00 2001 From: Jacob Weisz Date: Tue, 5 Jun 2018 00:23:59 -0500 Subject: [PATCH] Update Sandstorm build files --- .sandstorm/Vagrantfile | 2 +- .sandstorm/launcher.sh | 0 .sandstorm/sandstorm-files.list | 29 +++++++++++++++-------------- .sandstorm/setup.sh | 6 ++---- 4 files changed, 18 insertions(+), 19 deletions(-) mode change 100644 => 100755 .sandstorm/launcher.sh diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile index 7aa6899f2..71ed25900 100644 --- a/.sandstorm/Vagrantfile +++ b/.sandstorm/Vagrantfile @@ -80,7 +80,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if total_kB_ram.nil? or total_kB_ram < 2048000 assign_ram_mb = 512 else - assign_ram_mb = (total_kB_ram / 1024 / 4) + assign_ram_mb = (total_kB_ram / 1024 / 2) end # Actually apply these CPU/memory values to the providers. config.vm.provider :virtualbox do |vb, override| diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh old mode 100644 new mode 100755 diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 999859f3d..05d74010f 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -9,34 +9,34 @@ etc/gai.conf etc/ld.so.cache etc/localtime lib/terminfo/d/dumb -lib/x86_64-linux-gnu/ld-2.19.so -lib/x86_64-linux-gnu/libc-2.19.so +lib/x86_64-linux-gnu/ld-2.24.so +lib/x86_64-linux-gnu/libc-2.24.so lib/x86_64-linux-gnu/libc.so.6 -lib/x86_64-linux-gnu/libdl-2.19.so +lib/x86_64-linux-gnu/libdl-2.24.so lib/x86_64-linux-gnu/libdl.so.2 lib/x86_64-linux-gnu/libgcc_s.so.1 -lib/x86_64-linux-gnu/libm-2.19.so +lib/x86_64-linux-gnu/libm-2.24.so lib/x86_64-linux-gnu/libm.so.6 lib/x86_64-linux-gnu/libncurses.so.5 lib/x86_64-linux-gnu/libncurses.so.5.9 -lib/x86_64-linux-gnu/libnsl-2.19.so +lib/x86_64-linux-gnu/libnsl-2.24.so lib/x86_64-linux-gnu/libnsl.so.1 -lib/x86_64-linux-gnu/libnss_compat-2.19.so +lib/x86_64-linux-gnu/libnss_compat-2.24.so lib/x86_64-linux-gnu/libnss_compat.so.2 -lib/x86_64-linux-gnu/libnss_files-2.19.so +lib/x86_64-linux-gnu/libnss_files-2.24.so lib/x86_64-linux-gnu/libnss_files.so.2 -lib/x86_64-linux-gnu/libnss_nis-2.19.so +lib/x86_64-linux-gnu/libnss_nis-2.24.so lib/x86_64-linux-gnu/libnss_nis.so.2 lib/x86_64-linux-gnu/libpcre.so.3 -lib/x86_64-linux-gnu/libpcre.so.3.13.1 -lib/x86_64-linux-gnu/libpthread-2.19.so +lib/x86_64-linux-gnu/libpcre.so.3.13.3 +lib/x86_64-linux-gnu/libpthread-2.24.so lib/x86_64-linux-gnu/libpthread.so.0 -lib/x86_64-linux-gnu/librt-2.19.so +lib/x86_64-linux-gnu/librt-2.24.so lib/x86_64-linux-gnu/librt.so.1 lib/x86_64-linux-gnu/libselinux.so.1 lib/x86_64-linux-gnu/libtinfo.so.5 lib/x86_64-linux-gnu/libtinfo.so.5.9 -lib/x86_64-linux-gnu/libutil-2.19.so +lib/x86_64-linux-gnu/libutil-2.24.so lib/x86_64-linux-gnu/libutil.so.1 lib/x86_64-linux-gnu/libz.so.1 lib/x86_64-linux-gnu/libz.so.1.2.8 @@ -50,7 +50,8 @@ usr/bin/touch usr/lib/x86_64-linux-gnu/gconv/UTF-32.so usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache usr/lib/x86_64-linux-gnu/libffi.so.6 -usr/lib/x86_64-linux-gnu/libffi.so.6.0.2 usr/lib/x86_64-linux-gnu/libgmp.so.10 -usr/lib/x86_64-linux-gnu/libgmp.so.10.2.0 +usr/lib/x86_64-linux-gnu/libgmp.so.10.3.2 usr/local/bin/hledger-web +usr/share/zoneinfo/GMT +usr/share/zoneinfo/GMT+0 diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index e05853d7f..9ab622df4 100644 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -21,7 +21,5 @@ set -euo pipefail # By default, this script does nothing. You'll have to modify it as # appropriate for your application. -wget -q -O- https://s3.amazonaws.com/download.fpcomplete.com/debian/fpco.key | sudo apt-key add - -echo 'deb http://download.fpcomplete.com/debian/jessie stable main'|sudo tee /etc/apt/sources.list.d/fpco.list -apt-get update -apt-get install -y stack \ No newline at end of file +apt-get install -y libtinfo-dev +curl -ssl https://get.haskellstack.org/ | sh