diff --git a/beam-migrate/beam-migrate.cabal b/beam-migrate/beam-migrate.cabal
index f9812fa3..20831776 100644
--- a/beam-migrate/beam-migrate.cabal
+++ b/beam-migrate/beam-migrate.cabal
@@ -75,7 +75,7 @@ library
                        pretty               >=1.1     && <1.2,
                        dependent-map        >=0.2     && <0.5,
                        dependent-sum        >=0.4     && <0.8,
-                       pqueue               >=1.3     && <1.5,
+                       pqueue               >=1.3     && <1.6,
                        uuid-types           >=1.0     && <1.1
   default-language:    Haskell2010
   default-extensions:  KindSignatures, OverloadedStrings, TypeFamilies, FlexibleContexts,
diff --git a/beam-postgres/beam-postgres.cabal b/beam-postgres/beam-postgres.cabal
index 796cd9eb..c19ce6d0 100644
--- a/beam-postgres/beam-postgres.cabal
+++ b/beam-postgres/beam-postgres.cabal
@@ -36,8 +36,8 @@ library
                       beam-core            >=0.10 && <0.11,
                       beam-migrate         >=0.5  && <0.6,
 
-                      postgresql-libpq     >=0.8  && <0.10,
-                      postgresql-simple    >=0.5  && <0.7,
+                      postgresql-libpq     >=0.8  && <0.11,
+                      postgresql-simple    >=0.5  && <0.8,
 
                       text                 >=1.0  && <2.1,
                       bytestring           >=0.10 && <0.12,
@@ -48,7 +48,7 @@ library
                       free                 >=4.12 && <5.3,
                       time                 >=1.6  && <1.13,
                       monad-control        >=1.0  && <1.1,
-                      mtl                  >=2.1  && <2.3,
+                      mtl                  >=2.1  && <2.4,
                       conduit              >=1.2  && <1.4,
                       aeson                >=0.11 && <2.2,
                       uuid-types           >=1.0  && <1.1,
diff --git a/stack.yaml b/stack.yaml
index c5ff30b3..56ce57f8 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,24 +1,35 @@
-#resolver: lts-9.0
-#resolver: lts-10.3
-#resolver: lts-10.5
-#resolver: lts-12.17
-resolver: lts-16.0
-#resolver: nightly-2019-09-28
+resolver: lts-22.6
+
 packages:
-  - beam-sqlite
-  - beam-postgres
-  - beam-core
-  - beam-migrate
+- beam-sqlite
+- beam-postgres
+- beam-core
+- beam-migrate
 
 nix:
-  shell-file: shell.nix
+  packages:
+  - autoconf
+  - leveldb
+  - libelf
+  - libsodium # Needed by zeromq
+  - pcre
+  - pkg-config
+  - postgresql
+  - zeromq
+  - zlib
+  path:
+  - "nixpkgs=/home/tom/tools/nixpkgs"
+
+# nix:
+#   shell-file: shell.nix
+
+# extra-deps:
+#   - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
+#   - dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
+#   - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
+#   - direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718
+#   - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
 
-extra-deps:
-  - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
-  - dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
-  - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
-  - direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718
-  - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
 #extra-deps:
 #  - dependent-map-0.2.4.0
 #  - dependent-sum-0.5