From 347ea6775b92c55f23c06a1a09bdbea86c26870e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 11 Nov 2019 09:46:06 +0200
Subject: [PATCH] Support for Cabal 3.0

---
 .azure/azure-linux-template.yml |  7 +++---
 stack-nightly.yaml              | 22 ++++++++++++++++++
 stack-nightly.yaml.lock         | 40 +++++++++++++++++++++++++++++++++
 yesod-bin/ChangeLog.md          |  4 ++++
 yesod-bin/Devel.hs              |  4 +++-
 yesod-bin/yesod-bin.cabal       |  2 +-
 6 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 stack-nightly.yaml
 create mode 100644 stack-nightly.yaml.lock

diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml
index 45432663..1201b1cf 100644
--- a/.azure/azure-linux-template.yml
+++ b/.azure/azure-linux-template.yml
@@ -29,9 +29,10 @@ jobs:
         BUILD: stack
         STACK_YAML: stack-persistent-2-10.yaml
         ARGS: ""
-      #nightly:
-      #  BUILD: stack
-      #  ARGS: "--resolver nightly"
+      nightly:
+        BUILD: stack
+        STACK_YAML: stack-nightly.yaml
+        ARGS: "--resolver nightly"
     maxParallel: 6
   steps:
   - script: |
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
new file mode 100644
index 00000000..d9d2fd83
--- /dev/null
+++ b/stack-nightly.yaml
@@ -0,0 +1,22 @@
+resolver: nightly-2019-11-11
+packages:
+- ./yesod-core
+- ./yesod-static
+- ./yesod-persistent
+- ./yesod-newsfeed
+- ./yesod-form
+- ./yesod-form-multi
+# authenticate doesn't compile due to tagstream-conduit
+# - ./yesod-auth
+# - ./yesod-auth-oauth
+- ./yesod-sitemap
+- ./yesod-test
+- ./yesod-bin
+- ./yesod
+- ./yesod-eventsource
+- ./yesod-websockets
+extra-deps:
+- html-conduit-1.3.2.1
+- persistent-2.10.4
+- persistent-template-2.7.3
+- persistent-sqlite-2.10.5
diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock
new file mode 100644
index 00000000..be251986
--- /dev/null
+++ b/stack-nightly.yaml.lock
@@ -0,0 +1,40 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    hackage: html-conduit-1.3.2.1@sha256:61a9fe9e4c28c5feb7f68a84cac846a8db96bc46434e739f722fddaca7939529,2104
+    pantry-tree:
+      size: 504
+      sha256: 7e22a5f73125fa55b396e7a3deeadeba8d9c8e56668df5ad2ea0d5a3d240864a
+  original:
+    hackage: html-conduit-1.3.2.1
+- completed:
+    hackage: persistent-2.10.4@sha256:16c4c0823dd5e16bac4d607895ab0f4febd0626c020e5755ed1a52bf04068148,4738
+    pantry-tree:
+      size: 2094
+      sha256: b40d1783b539ddbbceaa827bf286d0b3bfcf76ca19e604c9d510b2a64008714e
+  original:
+    hackage: persistent-2.10.4
+- completed:
+    hackage: persistent-template-2.7.3@sha256:ac3e5e8c48e968b927bbf4e97162c52e7e417d69b05efeb1c581d7c682e043d2,2703
+    pantry-tree:
+      size: 560
+      sha256: fdfb2a721eb9c9831d7381d36bc52de0808a008ed3d553b6490080f337249684
+  original:
+    hackage: persistent-template-2.7.3
+- completed:
+    hackage: persistent-sqlite-2.10.5@sha256:50f8e3991fcf57d5744313fab8ecfa056d367d110aae43c03c45546445fea990,4993
+    pantry-tree:
+      size: 748
+      sha256: 42a52062ae795140362c2d929ba82f823904b785740a0837141c96eeec013115
+  original:
+    hackage: persistent-sqlite-2.10.5
+snapshots:
+- completed:
+    size: 418944
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2019/11/11.yaml
+    sha256: 12d3c25a6471bd6310df0fb5c064c24fc8aa8c5e9412d90e7980f36aa0cdd3f9
+  original: nightly-2019-11-11
diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md
index afbd437e..a6ee18df 100644
--- a/yesod-bin/ChangeLog.md
+++ b/yesod-bin/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.6.0.4
+
+* Support Cabal 3.0
+
 ## 1.6.0.3
 
 * Support Cabal 2.2 [#1151](https://github.com/yesodweb/yesod/issues/1511)
diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs
index b5fab5eb..92bc682e 100644
--- a/yesod-bin/Devel.hs
+++ b/yesod-bin/Devel.hs
@@ -286,7 +286,9 @@ devel opts passThroughArgs = do
 
     -- Find out the name of our package, needed for the upcoming Stack
     -- commands
-#if MIN_VERSION_Cabal(1, 20, 0)
+#if MIN_VERSION_Cabal(3, 0, 0)
+    cabal  <- D.tryFindPackageDesc D.silent "."
+#elif MIN_VERSION_Cabal(1, 20, 0)
     cabal  <- D.tryFindPackageDesc "."
 #else
     cabal  <- D.findPackageDesc "."
diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal
index 5f16a063..1ebd29b7 100644
--- a/yesod-bin/yesod-bin.cabal
+++ b/yesod-bin/yesod-bin.cabal
@@ -1,5 +1,5 @@
 name:            yesod-bin
-version:         1.6.0.3
+version:         1.6.0.4
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>