Merge branch 'main' into feature/issue2527-character-set

Author: winitzki

.github/workflows/main.yml

@@ -173,7 +173,7 @@ jobs:
           package 'dhall-yaml' "bin/dhall-to-yaml-ng${exe}" "bin/yaml-to-dhall${exe}"
       - name: "Upload package"
         if: ${{ matrix.stack-yaml == 'stack.yaml' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: 'dhall-${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}'
           path: 'dhall-*${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}'

dhall-docs/dhall-docs.cabal

@@ -76,7 +76,7 @@ Library
         filepath             >= 1.4       && < 1.6 ,
         microlens            >= 0.4       && < 0.5 ,
         lucid                >= 2.9.12    && < 2.12,
-        mmark                >= 0.0.7.0   && < 0.8 ,
+        mmark                >= 0.0.7.0   && < 0.0.9 ,
         -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
         megaparsec           >= 7         && < 10  ,
         path                 >= 0.7.0     && < 0.10,

dhall/src/Dhall/Marshal/Decode.hs

@@ -502,7 +502,7 @@ instance (Functor f, FromDhall (f (Result f))) => FromDhall (Fix f) where
                 | a /= b    = Core.subst (V a 0) (Var (V b 0)) (Core.shift 1 (V b 0) expr)
                 | otherwise = expr
 
-        expected = (\x -> Pi mempty "result" (Const Core.Type) (Pi mempty "Make" (Pi mempty "_" x "result") "result"))
+        expected = (\x -> Pi mempty "result" (Const Core.Type) (Pi mempty "_" (Pi mempty "_" x "result") "result"))
             <$> Dhall.Marshal.Decode.expected (autoWith inputNormalizer :: Decoder (f (Result f)))
 
 resultToFix :: Functor f => Result f -> Fix f

dhall/src/Dhall/Parser/Token.hs

@@ -747,7 +747,7 @@ ipLiteral :: Parser Text
 ipLiteral = "[" <> (ipV6Address <|> ipVFuture) <> "]"
 
 ipVFuture :: Parser Text
-ipVFuture = "v" <> plus (satisfy hexdig) <> "." <> plus (satisfy predicate)
+ipVFuture = ("v" <|> "V") <> plus (satisfy hexdig) <> "." <> plus (satisfy predicate)
   where
     predicate c = unreserved c || subDelims c || c == ':'
 
@@ -835,7 +835,7 @@ decOctet =
         predicate c = '\x30' <= c && c <= '\x35'
 
 domain :: Parser Text
-domain = domainLabel <> star ("." <> domainLabel ) <> option "."
+domain = domainLabel <> star (try ("." <> domainLabel )) <> option "."
 
 domainLabel :: Parser Text
 domainLabel = plus alphaNum_ <> star (plus "-" <> plus alphaNum_)