From d56af9be7330f0bd071e37f10e205b34fce86872 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 15 Aug 2018 10:50:55 +0300
Subject: [PATCH] Make pantry a dependency of stack

---
 package.yaml                                  | 21 ++-----------------
 stack-nightly.yaml                            |  5 +++++
 stack.yaml                                    |  5 +++++
 subs/pantry/package.yaml                      |  4 +---
 .../pantry/src}/Data/Aeson/Extended.hs        |  0
 subs/stack.yaml                               |  7 -------
 6 files changed, 13 insertions(+), 29 deletions(-)
 rename {src => subs/pantry/src}/Data/Aeson/Extended.hs (100%)
 delete mode 100644 subs/stack.yaml

diff --git a/package.yaml b/package.yaml
index 83cfee8803..b34def94d7 100644
--- a/package.yaml
+++ b/package.yaml
@@ -80,6 +80,7 @@ dependencies:
 - network-uri
 - open-browser
 - optparse-applicative
+- pantry
 - path
 - path-io
 - persistent
@@ -91,10 +92,8 @@ dependencies:
 - project-template
 - regex-applicative-text
 - resourcet
-- resource-pool
 - retry
 - rio
-- rio-orphans
 - semigroups
 - split
 - stm
@@ -102,7 +101,6 @@ dependencies:
 - store-core
 - streaming-commons
 - tar
-- tar-conduit
 - template-haskell
 - temporary
 - text
@@ -133,16 +131,13 @@ when:
     - bindings-uname
     - unix
 library:
-  source-dirs:
-  - src/
-  - subs/pantry/src
+  source-dirs: src/
   ghc-options:
   - -fwarn-identities
   generated-exposed-modules:
   - Paths_stack
   exposed-modules:
   - Control.Concurrent.Execute
-  - Data.Aeson.Extended
   - Data.Attoparsec.Args
   - Data.Attoparsec.Combinators
   - Data.Attoparsec.Interpreter
@@ -264,18 +259,6 @@ library:
   - Text.PrettyPrint.Leijen.Extended
   - System.Process.PagerEditor
   - System.Terminal
-  - Pantry
-  other-modules:
-  - Pantry.Archive
-  - Pantry.Hackage
-  - Pantry.HTTP
-  - Pantry.Repo
-  - Pantry.StaticBytes
-  - Pantry.StaticSHA256
-  - Pantry.Storage
-  - Pantry.Tree
-  - Pantry.Types
-  - Hackage.Security.Client.Repository.HttpLib.HttpClient
   when:
   - condition: 'os(windows)'
     then:
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
index 7309fee50e..40d3b4d370 100644
--- a/stack-nightly.yaml
+++ b/stack-nightly.yaml
@@ -1,5 +1,10 @@
 resolver: nightly-2018-08-04
 
+packages:
+- .
+- subs/pantry
+- subs/curator
+
 # docker:
 #   enable: true
 #   repo: fpco/stack-full
diff --git a/stack.yaml b/stack.yaml
index 43d1dda3a9..c793cc652b 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,10 @@
 resolver: snapshot.yaml
 
+packages:
+- .
+- subs/pantry
+- subs/curator
+
 # docker:
 #   enable: true
 #   repo: fpco/stack-full
diff --git a/subs/pantry/package.yaml b/subs/pantry/package.yaml
index 68b4c0fb46..eada447b50 100644
--- a/subs/pantry/package.yaml
+++ b/subs/pantry/package.yaml
@@ -53,9 +53,7 @@ when:
     - unix
 
 library:
-  source-dirs:
-  - src/
-  - ../../src/ # FIXME Temporary
+  source-dirs: src/
   exposed-modules:
   - Pantry
   # FIXME make these exports unnecessary
diff --git a/src/Data/Aeson/Extended.hs b/subs/pantry/src/Data/Aeson/Extended.hs
similarity index 100%
rename from src/Data/Aeson/Extended.hs
rename to subs/pantry/src/Data/Aeson/Extended.hs
diff --git a/subs/stack.yaml b/subs/stack.yaml
deleted file mode 100644
index 18ff100e82..0000000000
--- a/subs/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: ../snapshot.yaml
-packages:
-- pantry
-- curator
-
-ghc-options:
-   "$locals": -fhide-source-paths