stack 2.1.3 → 2.1.3.1
raw patch · 8 files changed
+93/−34 lines, 8 filesdep ~Cabaldep ~http-downloaddep ~optparse-applicative
Dependency ranges changed: Cabal, http-download, optparse-applicative, pantry, path, persistent-template, rio, unliftio
Files
- ChangeLog.md +8/−0
- doc/ChangeLog.md +8/−0
- snapshot.yaml +35/−0
- src/Stack/Prelude.hs +4/−21
- src/Stack/Storage/Project.hs +1/−0
- src/Stack/Storage/User.hs +1/−0
- stack.cabal +15/−13
- stack.yaml +21/−0
ChangeLog.md view
@@ -1,6 +1,14 @@ # Changelog +## v2.1.3.1++Hackage-only release:++* Support persistent-template-2.7.x+* Support rio-0.1.11.0+* Add `stack.yaml` back to hackage sdist, and add `snapshot.yaml`+ ## v2.1.3 **Changes since v2.1.1**
doc/ChangeLog.md view
@@ -1,6 +1,14 @@ # Changelog +## v2.1.3.1++Hackage-only release:++* Support persistent-template-2.7.x+* Support rio-0.1.11.0+* Add `stack.yaml` back to hackage sdist, and add `snapshot.yaml`+ ## v2.1.3 **Changes since v2.1.1**
+ snapshot.yaml view
@@ -0,0 +1,35 @@+resolver: lts-11.22+name: snapshot-for-building-stack-with-ghc-8.2.2++packages:+- ansi-terminal-0.9@rev:0+- Cabal-2.4.0.1@rev:0+- infer-license-0.2.0@rev:0 #for hpack-0.31+- hpack-0.31.2@rev:0+- githash-0.1.3.0@rev:0+- rio-orphans-0.1.1.0@sha256:15600084c56ef4e1f22ac2091d10fa6ed62f01f531d819c6a5a19492212a76c9+- yaml-0.10.4.0@rev:0 #for hpack-0.31+- tar-conduit-0.3.0@sha256:c220b7a74b986445d08706aed77f17f82807d0133a5f3a760f53d587d20865b2,2928+- hackage-security-0.5.3.0@rev:2+- http-api-data-0.3.8.1@rev:1+- cabal-doctest-1.0.6@rev:2+- unliftio-0.2.12@rev:0 #for rio-0.1.11.0+- happy-1.19.9@sha256:f8c774230735a390c287b2980cfcd2703d24d8dde85a01ea721b7b4b4c82944f,4667+- fsnotify-0.3.0.1@rev:1+- process-1.6.3.0@sha256:fc77cfe75a9653b8c54ae455ead8c06cb8adc4d7a340984d84d8ca880b579919,2370 #because of https://github.com/haskell/process/pull/101+- persistent-2.9.2@rev:0+- persistent-sqlite-2.9.3@rev:0+- rio-0.1.11.0@rev:0+- ansi-wl-pprint-0.6.8.2@rev:1 # for ansi-terminal-0.9+- hedgehog-0.6.1@rev:4 # for ansi-terminal-0.9+- typed-process-0.2.6.0@rev:0 # for rio-0.1.10.0+- rio-prettyprint-0.1.0.0+- hi-file-parser-0.1.0.0+- http-download-0.1.0.0+- pantry-0.1.1.1+- git: https://github.com/snoyberg/filelock.git+ commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc++drop-packages:+# See https://github.com/commercialhaskell/stack/pull/4712+- cabal-install
src/Stack/Prelude.hs view
@@ -25,7 +25,7 @@ ) where import RIO as X-import RIO.File as X+import RIO.File as X hiding (writeBinaryFileAtomic) import Data.Conduit as X (ConduitM, runConduit, (.|)) import Path as X (Abs, Dir, File, Path, Rel, toFilePath)@@ -46,10 +46,7 @@ import qualified Data.Text.IO as T import qualified RIO.Text as T-import System.Permissions (osIsWindows) -import Conduit- -- | Path version withSystemTempDir :: MonadUnliftIO m => String -> (Path Abs Dir -> m a) -> m a withSystemTempDir str inner = withRunInIO $ \run -> Path.IO.withSystemTempDir str $ run . inner@@ -216,21 +213,7 @@ defaultFirstFalse _ = False -- | Write a @Builder@ to a file and atomically rename.------ In the future: replace with a function in rio writeBinaryFileAtomic :: MonadIO m => Path absrel File -> Builder -> m ()-writeBinaryFileAtomic fp builder- -- Atomic file writing is not supported on Windows yet, unfortunately.- -- withSinkFileCautious needs to be implemented properly for Windows to make- -- this work.- | osIsWindows =- liftIO $- withBinaryFile (toFilePath fp) WriteMode $ \h ->- hPutBuilder h builder- | otherwise =- liftIO $- withSinkFileCautious (toFilePath fp) $ \sink ->- runConduit $- yield builder .|- unsafeBuilderToByteString .|- sink+writeBinaryFileAtomic fp builder =+ liftIO $+ withBinaryFileAtomic (toFilePath fp) WriteMode (\h -> hPutBuilder h builder)
src/Stack/Storage/Project.hs view
@@ -9,6 +9,7 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeFamilies #-}+{-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} -- | Work with SQLite database used for caches across a single project.
src/Stack/Storage/User.hs view
@@ -9,6 +9,7 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeFamilies #-}+{-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} -- | Work with SQLite database used for caches across an entire user account.
stack.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.0 name: stack-version: 2.1.3+version: 2.1.3.1 license: BSD3 license-file: LICENSE maintainer: manny@fpcomplete.com@@ -27,6 +27,8 @@ CONTRIBUTING.md ChangeLog.md README.md+ stack.yaml+ snapshot.yaml doc/azure_ci.md doc/build_command.md doc/build_overview.md@@ -265,7 +267,7 @@ network-uri >=2.6.1.0, open-browser >=0.2.1.0, optparse-applicative >=0.14.2.0,- pantry >=0.1.1.0,+ pantry >=0.1.1.1, path >=0.6.1, path-io >=1.3.3, persistent >=2.9.2,@@ -279,7 +281,7 @@ resource-pool >=0.2.3.2, resourcet >=1.2.1, retry >=0.7.6.3,- rio >=0.1.10.0,+ rio >=0.1.11.0, rio-prettyprint >=0.1.0.0, semigroups >=0.18.5, split >=0.2.3.3,@@ -298,7 +300,7 @@ typed-process >=0.2.6.0, unicode-transforms >=0.3.4, unix-compat >=0.5.0.1,- unliftio >=0.2.8.0,+ unliftio >=0.2.12, unordered-containers >=0.2.9.0, vector >=0.12.0.1, yaml >=0.10.4.0,@@ -386,7 +388,7 @@ network-uri >=2.6.1.0, open-browser >=0.2.1.0, optparse-applicative >=0.14.2.0,- pantry >=0.1.1.0,+ pantry >=0.1.1.1, path >=0.6.1, path-io >=1.3.3, persistent >=2.9.2,@@ -400,7 +402,7 @@ resource-pool >=0.2.3.2, resourcet >=1.2.1, retry >=0.7.6.3,- rio >=0.1.10.0,+ rio >=0.1.11.0, rio-prettyprint >=0.1.0.0, semigroups >=0.18.5, split >=0.2.3.3,@@ -420,7 +422,7 @@ typed-process >=0.2.6.0, unicode-transforms >=0.3.4, unix-compat >=0.5.0.1,- unliftio >=0.2.8.0,+ unliftio >=0.2.12, unordered-containers >=0.2.9.0, vector >=0.12.0.1, yaml >=0.10.4.0,@@ -510,7 +512,7 @@ open-browser >=0.2.1.0, optparse-applicative >=0.14.2.0, optparse-generic >=1.3.0,- pantry >=0.1.1.0,+ pantry >=0.1.1.1, path >=0.6.1, path-io >=1.3.3, persistent >=2.9.2,@@ -524,7 +526,7 @@ resource-pool >=0.2.3.2, resourcet >=1.2.1, retry >=0.7.6.3,- rio >=0.1.10.0,+ rio >=0.1.11.0, rio-prettyprint >=0.1.0.0, semigroups >=0.18.5, split >=0.2.3.3,@@ -543,7 +545,7 @@ typed-process >=0.2.6.0, unicode-transforms >=0.3.4, unix-compat >=0.5.0.1,- unliftio >=0.2.8.0,+ unliftio >=0.2.12, unordered-containers >=0.2.9.0, vector >=0.12.0.1, yaml >=0.10.4.0,@@ -635,7 +637,7 @@ network-uri >=2.6.1.0, open-browser >=0.2.1.0, optparse-applicative >=0.14.2.0,- pantry >=0.1.1.0,+ pantry >=0.1.1.1, path >=0.6.1, path-io >=1.3.3, persistent >=2.9.2,@@ -650,7 +652,7 @@ resource-pool >=0.2.3.2, resourcet >=1.2.1, retry >=0.7.6.3,- rio >=0.1.10.0,+ rio >=0.1.11.0, rio-prettyprint >=0.1.0.0, semigroups >=0.18.5, smallcheck >=1.1.5,@@ -671,7 +673,7 @@ typed-process >=0.2.6.0, unicode-transforms >=0.3.4, unix-compat >=0.5.0.1,- unliftio >=0.2.8.0,+ unliftio >=0.2.12, unordered-containers >=0.2.9.0, vector >=0.12.0.1, yaml >=0.10.4.0,
+ stack.yaml view
@@ -0,0 +1,21 @@+resolver: snapshot.yaml++packages:+- .++docker:+ enable: false+ repo: fpco/stack-build:lts-11.22++nix:+ # --nix on the command-line to enable.+ packages:+ - zlib+ - unzip+flags:+ stack:+ hide-dependency-versions: true+ supported-build: true++ghc-options:+ "$locals": -fhide-source-paths