From 72a6e48bcc495d74e2fb11ca6f4459544d6e5f40 Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Thu, 14 Apr 2016 15:01:57 -0700 Subject: [PATCH 1/3] updated ghcjs examples --- doc/ghcjs.md | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/doc/ghcjs.md b/doc/ghcjs.md index 37f3f31c92..91ca59468e 100644 --- a/doc/ghcjs.md +++ b/doc/ghcjs.md @@ -14,49 +14,41 @@ need to install a different version of `node`. See ## Example Configurations -### GHCJS (old base) - -You can use this resolver for GHCJS (old base) in your `stack.yaml`: - -```yaml -compiler: ghcjs-0.1.0.20150924_ghc-7.10.2 -compiler-check: match-exact -``` - ### GHCJS `master` (a.k.a. improved base) To use the master branch, a.k.a improved base, add the following to your `stack.yaml`: +GHCJS compiled with GHC 7.10.3 LTS-5.12 (stack.yaml upgraded from stock GHCJS) ```yaml -compiler: ghcjs-0.2.0.20151230.3_ghc-7.10.2 +compiler: ghcjs-0.2.0.20160414_ghc-7.10.3 compiler-check: match-exact setup-info: - ghcjs: - source: - ghcjs-0.2.0.20151230.3_ghc-7.10.2: - url: "https://github.com/nrolland/ghcjs/releases/download/v.0.2.0.20151230.3/ghcjs-0.2.0.20151230.3.tar.gz" + ghcjs: + source: + ghcjs-0.2.0.20160414_ghc-7.10.3: + url: https://s3.amazonaws.com/ghcjs/ghcjs-0.2.0.20160414_ghc-7.10.3.tar.gz + sha1: 6d6f307503be9e94e0c96ef1308c7cf224d06be3 ``` -or for the 2015-10-29 version +GHCJS compiled with GHC 7.10.2 LTS-3.6 (stack.yaml that comes with GHCJS) ```yaml -compiler: ghcjs-0.2.0.20151029_ghc-7.10.2 +compiler: ghcjs-0.2.0.20160414_ghc-7.10.2 compiler-check: match-exact setup-info: ghcjs: - source: - ghcjs-0.2.0.20151029_ghc-7.10.2: - url: "https://github.com/nrolland/ghcjs/releases/download/v0.2.0.20151029/ghcjs-0.2.0.20151029.tar.gz" + source: + ghcjs-0.2.0.20160414_ghc-7.10.2: + url: https://s3.amazonaws.com/ghcjs/ghcjs-0.2.0.20160414_ghc-7.10.2.tar.gz + sha1: f0a7243e781e27ebfe601eebaf5c57422007c142 ``` -or for the 2015-10-01 version +### GHCJS (old base) + +You can use this resolver for GHCJS (old base) in your `stack.yaml`: + ```yaml -compiler: ghcjs-0.2.0.20151001_ghc-7.10.2 +compiler: ghcjs-0.1.0.20150924_ghc-7.10.2 compiler-check: match-exact -setup-info: - ghcjs: - source: - ghcjs-0.2.0.20151001_ghc-7.10.2: - url: "https://github.com/fizruk/ghcjs/releases/download/v0.2.0.20151001/ghcjs-0.2.0.20151001.tar.gz" ``` ### Custom installed GHCJS (development branch) From b96ad527dce4359b470e6c799237422be6055654 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Fri, 15 Apr 2016 10:11:36 -0700 Subject: [PATCH 2/3] Allow persistent < 2.6 --- stack.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stack.cabal b/stack.cabal index 56e898b352..724494e997 100644 --- a/stack.cabal +++ b/stack.cabal @@ -176,9 +176,9 @@ library , optparse-applicative >= 0.11 && < 0.13 , path >= 0.5.1 , path-io >= 1.0.0 && < 2.0.0 - , persistent >= 2.1.2 - , persistent-sqlite >= 2.1.4 - , persistent-template >= 2.1.1 + , persistent >= 2.1.2 && < 2.6 + , persistent-sqlite >= 2.1.4 && < 2.6 + , persistent-template >= 2.1.1 && < 2.6 , pretty >= 1.1.1.1 , process >= 1.2.0.0 , resourcet >= 1.1.4.1 From 30330a57202aaaae8ee8b149e50f8ba99d76d97f Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Sat, 23 Apr 2016 09:46:38 -0700 Subject: [PATCH 3/3] release: add support for Ubuntu 16.04 (#2056) --- doc/install_and_upgrade.md | 4 ++++ etc/scripts/release.hs | 3 ++- etc/scripts/vagrant-releases.sh | 2 +- etc/vagrant/centos-6-i386/Vagrantfile | 2 +- etc/vagrant/centos-6-x86_64/Vagrantfile | 2 +- etc/vagrant/centos-7-x86_64/Vagrantfile | 2 +- etc/vagrant/debian-7-amd64/Vagrantfile | 2 +- etc/vagrant/debian-7-i386/Vagrantfile | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md index 510ad08389..d90b9f4e99 100644 --- a/doc/install_and_upgrade.md +++ b/doc/install_and_upgrade.md @@ -100,6 +100,10 @@ problems, see the linked FAQ entries: 2. Add the appropriate source repository (if not sure, run ``lsb_release -a`` to find out your Ubuntu version): + * Ubuntu 16.04 (amd64): + + echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|sudo tee /etc/apt/sources.list.d/fpco.list + * Ubuntu 15.10 (amd64): echo 'deb http://download.fpcomplete.com/ubuntu wily main'|sudo tee /etc/apt/sources.list.d/fpco.list diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 5e90115316..34573783b5 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -429,7 +429,8 @@ rules global@Global{..} args = do , ("14.04", "trusty") , ("14.10", "utopic") , ("15.04", "vivid") - , ("15.10", "wily") ] + , ("15.10", "wily") + , ("16.04", "xenial") ] debianVersions = [ ("7", "wheezy") , ("8", "jessie") ] diff --git a/etc/scripts/vagrant-releases.sh b/etc/scripts/vagrant-releases.sh index 65e855a8f1..8068ef5612 100755 --- a/etc/scripts/vagrant-releases.sh +++ b/etc/scripts/vagrant-releases.sh @@ -21,7 +21,7 @@ if [[ "$(basename "$0")" == "vagrant-releases.sh" ]]; then with_vagrant centos-6-x86_64 "--binary-variant=gmp4 --upload-label='Linux 64-bit, libgmp4 for CentOS 6.x' release" with_vagrant centos-6-i386 "--binary-variant=gmp4 --upload-label='Linux 32-bit, libgmp4 for CentOS 6.x' release" elif [[ "$(basename "$0")" == "vagrant-distros.sh" ]]; then - with_vagrant debian-7-amd64 "upload-ubuntu-12.04 upload-ubuntu-14.04 upload-ubuntu-14.10 upload-ubuntu-15.04 upload-ubuntu-15.10 upload-debian-7 upload-debian-8" + with_vagrant debian-7-amd64 "upload-ubuntu-12.04 upload-ubuntu-14.04 upload-ubuntu-14.10 upload-ubuntu-15.04 upload-ubuntu-15.10 upload-ubuntu-16.04 upload-debian-7 upload-debian-8" with_vagrant centos-7-x86_64 "upload-centos-7 upload-fedora-21 upload-fedora-22 upload-fedora-23" with_vagrant centos-6-x86_64 "--binary-variant=gmp4 upload-centos-6" else diff --git a/etc/vagrant/centos-6-i386/Vagrantfile b/etc/vagrant/centos-6-i386/Vagrantfile index 1a6ff571b7..3ed0d8dbe0 100644 --- a/etc/vagrant/centos-6-i386/Vagrantfile +++ b/etc/vagrant/centos-6-i386/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| config.vm.box = "puppetlabs/centos-6.6-32-nocm" - config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] + config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack-work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] config.vm.provider "virtualbox" do |vb| vb.memory = "2048" end diff --git a/etc/vagrant/centos-6-x86_64/Vagrantfile b/etc/vagrant/centos-6-x86_64/Vagrantfile index cb0f6baedb..1ca25959d1 100644 --- a/etc/vagrant/centos-6-x86_64/Vagrantfile +++ b/etc/vagrant/centos-6-x86_64/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| config.vm.box = "puppetlabs/centos-6.6-64-nocm" - config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] + config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack-work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] config.vm.provider "virtualbox" do |vb| vb.memory = "2048" end diff --git a/etc/vagrant/centos-7-x86_64/Vagrantfile b/etc/vagrant/centos-7-x86_64/Vagrantfile index 8aa591bfea..c9f46ceffa 100644 --- a/etc/vagrant/centos-7-x86_64/Vagrantfile +++ b/etc/vagrant/centos-7-x86_64/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| config.vm.box = "puppetlabs/centos-7.0-64-nocm" - config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] + config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack-work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] config.vm.provider "virtualbox" do |vb| vb.memory = "2048" end diff --git a/etc/vagrant/debian-7-amd64/Vagrantfile b/etc/vagrant/debian-7-amd64/Vagrantfile index 0f8d12dc0d..0c8a2f15ff 100644 --- a/etc/vagrant/debian-7-amd64/Vagrantfile +++ b/etc/vagrant/debian-7-amd64/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| config.vm.box = "puppetlabs/debian-7.8-64-nocm" - config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] + config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack-work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] config.vm.provider "virtualbox" do |vb| vb.memory = "2048" end diff --git a/etc/vagrant/debian-7-i386/Vagrantfile b/etc/vagrant/debian-7-i386/Vagrantfile index efc8d379b2..5d5e6c3959 100644 --- a/etc/vagrant/debian-7-i386/Vagrantfile +++ b/etc/vagrant/debian-7-i386/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| config.vm.box = "puppetlabs/debian-7.8-32-nocm" - config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] + config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack-work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"] config.vm.provider "virtualbox" do |vb| vb.memory = "2048" end