Merge branch 'stable'

ljli · Apr 23, 2016 · 57eb614 · 57eb614
2 parents 6f7871b + 30330a5
commit 57eb614
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git 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
@@ -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-distros.sh b/etc/scripts/vagrant-distros.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -xe
-"$(dirname "$0")/with-vagrant.sh" 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"
+"$(dirname "$0")/with-vagrant.sh" 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"
 "$(dirname "$0")/with-vagrant.sh" centos-7-x86_64 "$* upload-centos-7 upload-fedora-21 upload-fedora-22 upload-fedora-23"
 "$(dirname "$0")/with-vagrant.sh" centos-6-x86_64 "$* --binary-variant=gmp4 upload-centos-6"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/stack.cabal b/stack.cabal
@@ -181,9 +181,9 @@ library
                    , optparse-applicative >= 0.11 && < 0.13
                    , path >= 0.5.1
                    , path-io >= 1.1.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