diff --git a/src/Spago/PackageSet.hs b/src/Spago/PackageSet.hs index 77503a3e6..a15e669a8 100644 --- a/src/Spago/PackageSet.hs +++ b/src/Spago/PackageSet.hs @@ -11,7 +11,6 @@ import Spago.Prelude import qualified Data.Text as Text import qualified Data.Versions as Version -import Dhall.Binary (defaultStandardVersion) import qualified Dhall.Freeze import qualified Dhall.Pretty @@ -231,7 +230,6 @@ freeze path = do Dhall.Freeze.OnlyRemoteImports Dhall.Freeze.Secure Dhall.Pretty.ASCII - defaultStandardVersion -- | Freeze the file if any of the remote imports are not frozen diff --git a/src/Spago/PscPackage.hs b/src/Spago/PscPackage.hs index aa8d289fe..b3eb7677f 100644 --- a/src/Spago/PscPackage.hs +++ b/src/Spago/PscPackage.hs @@ -62,7 +62,7 @@ dhallToJSON inputPath outputPath = do dhall <- readTextFile $ T.fromText inputPath - jsonVal <- liftIO $ Dhall.JSON.codeToValue Dhall.JSON.NoConversion Dhall.JSON.ForbidWithinJSON inputPath dhall + jsonVal <- liftIO $ Dhall.JSON.codeToValue Dhall.JSON.NoConversion Dhall.JSON.ForbidWithinJSON (Just $ Text.unpack inputPath) dhall writeTextFile outputPath $ Text.decodeUtf8 diff --git a/src/Spago/Purs.hs b/src/Spago/Purs.hs index 48da989b9..d13e9c731 100644 --- a/src/Spago/Purs.hs +++ b/src/Spago/Purs.hs @@ -117,7 +117,7 @@ versionImpl :: Spago m => Text -> m (Maybe Version.SemVer) versionImpl purs = do fullVersionText <- shellStrictWithErr (purs <> " --version") empty >>= \case (ExitSuccess, out, _err) -> pure out - _ -> die $ "Failed to run '" <> purs <> " --version'" + (_, _out, err) -> die $ "Failed to run '" <> purs <> " --version'. Error:" <> err versionText <- pure $ headMay $ Text.split (== ' ') fullVersionText parsed <- pure $ versionText >>= (hush . Version.semver) diff --git a/stack.yaml b/stack.yaml index 9fd31b67c..56f1da627 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,8 +2,8 @@ resolver: lts-14.3 packages: - . extra-deps: -- dhall-1.25.0 -- dhall-json-1.4.0 +- dhall-1.26.0 +- dhall-json-1.4.1 - github-0.22 - async-pool-0.9.0.2@sha256:3aca5861a7b839d02a3f5c52ad6d1ce368631003f68c3d9cb6d711c29e9618db,1599 - binary-instances-1@sha256:cdef50410f2797de38f021d328d38c32b2f4abeaab86bfaf78e0657150863090,2613 diff --git a/stack.yaml.lock b/stack.yaml.lock index e416dae0e..f18546bf2 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,19 +5,19 @@ packages: - completed: - hackage: dhall-1.25.0@sha256:1c6724d963bf3428ddf0336f916e3f9bc429bf81ed2e27a8855dbbee11d89fe2,40352 + hackage: dhall-1.26.0@sha256:0f559ab8ed9d7b7f1ed0e2a99a9aadee00d8c6c63b92e9be209d84f7f4197b10,33247 pantry-tree: - size: 225143 - sha256: 0ed1fb4d2bc400d71e9445199f5af8985ba8e1faad029b416745aa4ac5c8f20d + size: 221712 + sha256: cbd35293fc6b2ef77e5d64fca3775b2915aea86ad0c3425e08d21c950fcd06ea original: - hackage: dhall-1.25.0 + hackage: dhall-1.26.0 - completed: - hackage: dhall-json-1.4.0@sha256:74f6422e7b84d32f9965b604e09bc1eb10dc4b9693f735be30a5fb1e4dd61478,5240 + hackage: dhall-json-1.4.1@sha256:5b0dac356e84d03e855aa4e8aa455532c4c4a274154e26756ae77ebbc82c89a4,5398 pantry-tree: - size: 2261 - sha256: fee6d6d1be4a2e1ef1ce1986a89f71a5ef95fb55e519db475e1f3ac9e76b9662 + size: 3387 + sha256: 77290c47daa5960e967ff219ce9c44ffd3035e64acd6a1d42268eb366b2c4264 original: - hackage: dhall-json-1.4.0 + hackage: dhall-json-1.4.1 - completed: hackage: github-0.22@sha256:13f09e904248a40dd173c08f2859d0dfda178a7c27f88df20b70a0d5a7614757,6909 pantry-tree: