Skip to content

Commit 7823efc

Browse files
KikoEliasC
Kiko
authored andcommitted
update vagrant to use stack (parapluu#561)
* update vagrant to use stack * update ghc * add more memory for installation
1 parent 5edbf8a commit 7823efc

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

Vagrantfile

+8-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Vagrant.configure(2) do |config|
6262
vb.customize ["modifyvm", :id, "--cpus", cpus]
6363

6464
# Customize the amount of memory on the VM:
65-
vb.memory = "2048"
65+
vb.memory = "4096"
6666
end
6767

6868
#
@@ -86,7 +86,13 @@ Vagrant.configure(2) do |config|
8686
sudo update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8;
8787
sudo add-apt-repository -y ppa:hvr/ghc;
8888
sudo apt-get update -qq;
89-
sudo apt-get install -y -qq ghc-7.10.2 cabal-install-1.22;
89+
sudo apt-get install -y -qq ghc-7.10.3 cabal-install-1.22;
90+
91+
# Add Stackage to Trusty64
92+
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 575159689BEFB442
93+
echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/sources.list.d/fpco.list
94+
sudo apt-get update && sudo apt-get install stack -y
95+
9096
cabal sandbox init;
9197
export HOME=/home/vagrant && ./debian-install.sh -f
9298
SHELL

debian-install.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ while getopts 'qrbphf' flag; do
1515
h) echo "Available flags are:";\
1616
echo "-q Quiet. Run in quiet mode, I.e don't print as much stuff";
1717
echo "-r Replace ghc and cabal. Will change the path \$PATH";
18-
echo " to point to ghc version 7.10.2 and cabal to version 1.22.";
18+
echo " to point to ghc version 7.10.3 and cabal to version 1.22.";
1919
echo "-s Adds Encore to the \$PATH variable. Has no effect unless the \`-b\` flag is used.";
2020
echo "-b Builds Encore.";
2121
echo "-h Print this message and exit.";
@@ -38,20 +38,20 @@ sudo apt-get install -y $quiet\
3838
make\
3939
premake4\
4040
zlib1g-dev \
41-
ghc-7.10.2\
41+
ghc-7.10.3\
4242
cabal-install-1.22\
4343
racket\
4444
doxygen
4545

4646
if $replace
4747
then
48-
if ((hash ghc 2>/dev/null) && (ghc --version | grep -q 7.10.2))
48+
if ((hash ghc 2>/dev/null) && (ghc --version | grep -q 7.10.3))
4949
then
5050
echo "--==HASKELL VERSION IS CORRECT==--"
5151
else
5252
echo "--==SETTING HASKELL PATH==--"
53-
echo 'export PATH=/opt/ghc/7.10.2/bin:$PATH' >> $HOME/.profile
54-
export PATH=/opt/ghc/7.10.2/bin:$PATH
53+
echo 'export PATH=/opt/ghc/7.10.3/bin:$PATH' >> $HOME/.profile
54+
export PATH=/opt/ghc/7.10.3/bin:$PATH
5555
fi
5656

5757
if ((hash cabal 2>/dev/null) && (cabal --version | grep -q 1.22))

0 commit comments

Comments
 (0)