diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 828f12ec8..9288b73a0 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: haskell/actions/setup@v1
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.4'
+        cabal-version: '3.6'
 
     - name: Cache
       uses: actions/cache@v1
diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
index 45a270252..230a28ba4 100644
--- a/.github/workflows/nix.yaml
+++ b/.github/workflows/nix.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
+      - uses: cachix/install-nix-action@v16
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix-shell --run "cabal update && cabal build all"
diff --git a/cabal.project b/cabal.project
index aa854048e..c6b74a36a 100644
--- a/cabal.project
+++ b/cabal.project
@@ -10,24 +10,3 @@ tests: True
 benchmarks: True
 test-show-details: direct
 haddock-quickjump: True
-
-allow-newer:
-  lens:template-haskell,
-  cryptohash-sha1:base,
-  cryptohash-md5:base,
-  hslogger:base,
-  entropy:Cabal,
-
--- Required for ghc-9.0.1 support
-source-repository-package
-  type: git
-  location: https://github.com/anka-213/th-extras
-  tag: 57a97b4df128eb7b360e8ab9c5759392de8d1659
--- https://github.com/mokus0/th-extras/pull/8
-
-source-repository-package
-  type: git
-  location: https://github.com/anka-213/dependent-sum
-  tag: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5
-  subdir: dependent-sum-template
--- https://github.com/obsidiansystems/dependent-sum/pull/57
diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal
index 2f1a318e0..111b57b3b 100644
--- a/lsp-test/lsp-test.cabal
+++ b/lsp-test/lsp-test.cabal
@@ -99,7 +99,7 @@ test-suite func-test
   main-is:             FuncTest.hs
   hs-source-dirs:      func-test
   type:                exitcode-stdio-1.0
-  build-depends:       base <4.16
+  build-depends:       base 
                      , lsp-test
                      , lsp
                      , data-default
@@ -124,7 +124,7 @@ benchmark simple-bench
   main-is:             SimpleBench.hs
   hs-source-dirs:      bench
   type:                exitcode-stdio-1.0
-  build-depends:       base <4.16
+  build-depends:       base
                      , lsp-test
                      , lsp
                      , process
diff --git a/lsp-types/lsp-types.cabal b/lsp-types/lsp-types.cabal
index 36a0607c8..4ca08008a 100644
--- a/lsp-types/lsp-types.cabal
+++ b/lsp-types/lsp-types.cabal
@@ -70,7 +70,7 @@ library
                      , Language.LSP.Types.WorkspaceSymbol
  -- other-extensions:
   ghc-options:         -Wall
-  build-depends:       base >= 4.11 && < 4.16
+  build-depends:       base >= 4.11 && < 5
                      , aeson >=1.2.2.0
                      , binary
                      , bytestring
diff --git a/lsp/lsp.cabal b/lsp/lsp.cabal
index 1d0b70024..7cec6d64b 100644
--- a/lsp/lsp.cabal
+++ b/lsp/lsp.cabal
@@ -31,7 +31,7 @@ library
                      , Language.LSP.Server.Control
                      , Language.LSP.Server.Processing
   ghc-options:         -Wall
-  build-depends:       base >= 4.11 && < 4.16
+  build-depends:       base >= 4.11 && < 5
                      , async
                      , aeson >=1.0.0.0
                      , attoparsec
@@ -67,7 +67,7 @@ executable lsp-demo-reactor-server
   default-language:    Haskell2010
   ghc-options:         -Wall -Wno-unticked-promoted-constructors
 
-  build-depends:       base >= 4.11 && < 4.16
+  build-depends:       base 
                      , aeson
                      , bytestring
                      , containers
@@ -91,7 +91,7 @@ executable lsp-demo-simple-server
   hs-source-dirs:      example
   default-language:    Haskell2010
   ghc-options:         -Wall -Wno-unticked-promoted-constructors
-  build-depends:       base >= 4.11 && < 5
+  build-depends:       base 
                     -- the package library. Comment this out if you want repl changes to propagate
                      , lsp
                      , text