stack 1.9.1 → 1.9.1.1
raw patch · 5 files changed
+28/−9 lines, 5 filesdep ~aesondep ~conduitdep ~containers
Dependency ranges changed: aeson, conduit, containers, directory, filepath, githash, persistent, persistent-sqlite, persistent-template, primitive, resourcet, stm, template-haskell
Files
- ChangeLog.md +9/−0
- doc/ChangeLog.md +9/−0
- src/main/Main.hs +7/−6
- stack.cabal +2/−2
- stack.yaml +1/−1
ChangeLog.md view
@@ -1,6 +1,15 @@ # Changelog +## v1.9.1.1++Hackage-only release with no user facing changes.++* Stack can now be compiled again inside a directory that does not+ contain a `.git` directory, see+ [#4364](https://github.com/commercialhaskell/stack/issues/4364#issuecomment-431600841)++ ## v1.9.1 Release notes:
doc/ChangeLog.md view
@@ -1,6 +1,15 @@ # Changelog +## v1.9.1.1++Hackage-only release with no user facing changes.++* Stack can now be compiled again inside a directory that does not+ contain a `.git` directory, see+ [#4364](https://github.com/commercialhaskell/stack/issues/4364#issuecomment-431600841)++ ## v1.9.1 Release notes:
src/main/Main.hs view
@@ -33,7 +33,7 @@ import Data.Version (showVersion) import RIO.Process #ifdef USE_GIT_INFO-import GitHash (giCommitCount, giHash, tGitInfoCwd)+import GitHash (giCommitCount, giHash, tGitInfoCwdTry) #endif import Distribution.System (buildArch) import qualified Distribution.Text as Cabal (display)@@ -128,20 +128,21 @@ [ [$(simpleVersion Meta.version)] -- Leave out number of commits for --depth=1 clone -- See https://github.com/commercialhaskell/stack/issues/792- , [" (" ++ show commitCount ++ " commits)" | commitCount /= 1]+ , case giCommitCount <$> $$tGitInfoCwdTry of+ Left _ -> []+ Right 1 -> []+ Right count -> [" (", show count, " commits)"] , [" ", Cabal.display buildArch] , [depsString, warningString] ]- where- commitCount = giCommitCount $$tGitInfoCwd #else versionString' = showVersion Meta.version ++ ' ' : Cabal.display buildArch ++ depsString ++ warningString- where #endif+ where #ifdef HIDE_DEP_VERSIONS depsString = " hpack-" ++ VERSION_hpack #else@@ -678,7 +679,7 @@ upgrade (globalConfigMonoid go) (globalResolver go) #ifdef USE_GIT_INFO- (Just (giHash $$tGitInfoCwd))+ (either (const Nothing) (Just . giHash) $$tGitInfoCwdTry) #else Nothing #endif
stack.cabal view
@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: c1123498f6d6ebc3a0fc03b968146f349da538acc9bfa189e0f65c5cd447aca6+-- hash: 5391b945e4e909f5af3e31d85837dc4605515eb0ed4ae9460c773a8a8eb4b999 name: stack-version: 1.9.1+version: 1.9.1.1 synopsis: The Haskell Tool Stack description: Please see the README.md for usage information, and the wiki on Github for more details. Also, note that the API for the library is not currently stable, and may change significantly, even between minor releases. It is currently only intended for use by the executable. category: Development
stack.yaml view
@@ -23,7 +23,7 @@ - infer-license-0.2.0@rev:0 #for hpack-0.31 - hpack-0.31.0@rev:0 - http-api-data-0.3.8.1@rev:1-- githash-0.1.1.0@rev:0+- githash-0.1.2.0@rev:0 - yaml-0.10.4.0@rev:0 #for hpack-0.31 - windns-0.1.0.0@rev:0 - hackage-security-0.5.3.0@rev:2