diff --git a/build-constraints.yaml b/build-constraints.yaml
index a44e7a4a..7ccc8bb4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -179,7 +179,7 @@ packages:
         - executable-path
         - foreign-store
         - formatting
-        # - gtk2hs-buildtools # via hashtables: bounds: vector
+        - gtk2hs-buildtools
         - happy
         - hybrid-vectors
         - indents
@@ -332,7 +332,7 @@ packages:
         - hostname-validate
         - ini
         - lucid
-        # - osdkeys # via libnotify: via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - osdkeys # via libnotify
         - pdfinfo
         # - present # compilation failure against haskell-src-exts
         - pure-io
@@ -348,13 +348,13 @@ packages:
         # - structured-haskell-mode # bounds: haskell-src-exts # via: applicative-quoters
 
     "Alberto G. Corona <agocorona@gmail.com> @agocorona":
-        # - RefSerialize # via hashtables: bounds: vector
-        # - TCache # via hashtables: bounds: vector
-        # - Workflow # via RefSerialize: via hashtables: bounds: vector
-        # - MFlow # via RefSerialize: via hashtables: bounds: vector
+        - RefSerialize
+        - TCache
+        - Workflow
+        - MFlow
         - transient
-        # - transient-universe # via TCache: via hashtables: bounds: vector
-        # - ghcjs-hplay # via transient-universe: via TCache: via hashtables: bounds: vector
+        - transient-universe
+        - ghcjs-hplay
 
     "Edward Kmett <ekmett@gmail.com> @ekmett":
         - ad
@@ -389,7 +389,7 @@ packages:
         - lca
         - lens
         - linear
-        # - linear-accelerate # via accelerate: via hashtables: bounds: vector
+        - linear-accelerate
         # - log-domain # via safecopy: bounds: vector
         - machines
         - monadic-arrays
@@ -453,10 +453,10 @@ packages:
         - diagrams
         - diagrams-builder
         # - diagrams-haddock # BLOCKED directory 1.3 via cautious-file
-        # - diagrams-cairo # bounds: vector
+        - diagrams-cairo # bounds: vector
         - diagrams-contrib
         - diagrams-core
-        # - diagrams-gtk # via diagrams-cairo: bounds: vector
+        - diagrams-gtk
         - diagrams-lib
         - diagrams-postscript
         - diagrams-rasterific
@@ -508,8 +508,7 @@ packages:
         - ChannelT
 
     "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
-        []
-        # - accelerate # via hashtables: bounds: vector
+        - accelerate
 
     "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
         []
@@ -764,11 +763,11 @@ packages:
 
     "Simon Michael <simon@joyful.com> @simonmichael":
         - darcs
-        # - hledger # via hledger-lib: via hashtables: bounds: vector
-        # - hledger-lib # via hashtables: bounds: vector
-        # - hledger-ui # via hledger-lib: via hashtables: bounds: vector
-        # - hledger-web # via hledger-lib: via hashtables: bounds: vector
-        # - hledger-api # via hledger-lib: via hashtables: bounds: vector
+        - hledger
+        - hledger-lib
+        - hledger-ui
+        - hledger-web
+        - hledger-api
         # - shelltestrunner # bounds: Diff, HUnit
         - quickbench
         - regex-compat-tdfa
@@ -866,7 +865,7 @@ packages:
         - multimap
         - parallel-io
         - text-binary
-        # - Chart-cairo # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - Chart-cairo
         - ghc-events
         - monad-extras
         # - stack < 9.9.9 # bounds: ghc, template-haskell
@@ -881,7 +880,7 @@ packages:
         - base-prelude
         - cases
         - focus
-        # - hasql # via hashtables: bounds: vector
+        - hasql
         - list-t
         - mtl-prelude
         - neat-interpolation
@@ -1005,15 +1004,15 @@ packages:
         - xmonad-contrib
         - shelly
 
-        # - cairo # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gio # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - glib # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gtk # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gtk3 # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - gtksourceview3 # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - pango # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - webkitgtk3 # via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - webkitgtk3-javascriptcore # via gtk2hs-buildtools: via hashtables: bounds: vector
+        - cairo
+        - gio
+        - glib
+        - gtk
+        - gtk3
+        - gtksourceview3
+        - pango
+        - webkitgtk3
+        - webkitgtk3-javascriptcore
 
         - ghcjs-codemirror
         # - ghcjs-dom # via: ghcjs-dom-jsaddle # https://github.com/fpco/stackage/issues/1569
@@ -1399,9 +1398,9 @@ packages:
         - hmatrix-gsl-stats
         - hsignal
         - hstatistics
-        # - plot # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - plot-gtk # via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - plot-gtk3 # via gtk3: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - plot
+        - plot-gtk
+        - plot-gtk3
         - vector-buffer
         # - hmatrix-repa # via repa: bounds: vector
 
@@ -1478,7 +1477,7 @@ packages:
         - elm-export
         - elm-export-persistent
         # - pipes-csv # via cassava: bounds: vector
-        # - pipes-mongodb # via mongoDB: via hashtables: bounds: vector
+        - pipes-mongodb # via mongoDB
         - servant-elm
         - skeletons
         - streaming-wai
@@ -1538,8 +1537,8 @@ packages:
         - triesn
         - path-extra
         # - pred-trie # via poly-arity
-        # - pred-set # via hashtables: bounds: vector
-        # - HSet # via hashtables: bounds: vector
+        - pred-set
+        - HSet
 
     "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":
         - boundingboxes
@@ -1826,8 +1825,7 @@ packages:
         # - ipython-kernel # GHC 8
 
     "Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
-        []
-        # - Agda # via hashtables: bounds: vector
+        - Agda
 
     "James Cook <mokus@deepbondi.net> @mokus0":
         - dependent-sum
@@ -1840,7 +1838,7 @@ packages:
     "Timo von Holtz <tvh@tvholtz.de> @tvh":
         - ekg-wai
         - haxl-amazonka
-        # - hasql-migration # via hasql: via hashtables: bounds: vector
+        - hasql-migration
         - servant-JuicyPixels
 
     "Artyom <yom@artyom.me> @neongreen":
@@ -1972,7 +1970,7 @@ packages:
         - smallcaps
 
     "Gregory Collins <greg@gregorycollins.net> @gregorycollins":
-        # - hashtables # bounds: vector
+        - hashtables
         - io-streams
         - openssl-streams
 
@@ -2001,7 +1999,7 @@ packages:
         - cabal2nix
         - funcmp
         - hackage-db
-        # - hledger-interest # via hledger-lib: via hashtables: bounds: vector
+        - hledger-interest
         - hopenssl
         - hsdns
         - hsemail
@@ -2071,8 +2069,7 @@ packages:
         # - multiplate # bounds: transformers
 
     "Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in> @sumitsahrawat":
-        []
-        # - plot-gtk-ui # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - plot-gtk-ui
         # - calculator # bounds: ghc, base
 
     "Emmanuel Touzery <etouzery@gmail.com> @emmanueltouzery":
@@ -2500,8 +2497,8 @@ packages:
         - wikicfp-scraper
         - wild-bind
         - wild-bind-x11
-        # - wild-bind-indicator # via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
-        # - wild-bind-task-x11 # via wild-blind-indicator: via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - wild-bind-indicator
+        - wild-bind-task-x11
 
     "Cies Breijs <cies@kde.nl> @cies":
         - htoml
@@ -2586,7 +2583,7 @@ packages:
         - open-witness
 
     "Victor Denisov <denisovenator@gmail.com> @VictorDenisov":
-        # - mongoDB # via hashtables: bounds: vector
+        - mongoDB
         - bson
 
     "Alexis King <lexi.lambda@gmail.com> @lexi-lambda":
@@ -2729,7 +2726,7 @@ packages:
     "Mahdi Dibaiee <mdibaiee@aol.com>":
         - picedit
         - mathexpr
-        # - sibe # via Chart-cairo: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
+        - sibe
 
     "Alexis Williams <sasinestro@gmail.com> @typedrat":
         # - stb-image-redux # bounds: vector
@@ -2773,8 +2770,7 @@ packages:
         # - hip # via repa: bounds: vector
 
     "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
-        []
-        # - hledger-iadd # via hledger-lib: via hashtables: bounds: vector
+        - hledger-iadd
 
     "Roy Levien <royl@aldaron.com> @orome":
         - crypto-enigma
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 85fdc0f3..63c1a6a8 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -22,9 +22,8 @@ add-apt-repository ppa:hvr/ghc -y
 add-apt-repository -y ppa:marutter/rrutter
 # not sure what this was needed for
 #add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
-wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
-echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
+#wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
 
 # Set the GHC version
 GHCVER=8.0.2
@@ -115,8 +114,8 @@ apt-get install -y \
     libzip-dev \
     libzmq3-dev \
     llvm-3.7 \
+    llvm-4.0 \
     locales \
-    llvm-4.0-dev \
     m4 \
     nettle-dev \
     nodejs \