Merge branch 'release-v0.5.6'

* release-v0.5.6: Bump version and update changelogs Fix glob path order
rzk-lang · Sep 19, 2023 · a6b407d · a6b407d
2 parents 640f079 + 99669f2
commit a6b407d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/docs/docs/getting-started/changelog.md b/docs/docs/getting-started/changelog.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the
 [Haskell Package Versioning Policy](https://pvp.haskell.org/).
 
+## v0.5.6 — 2023-09-19
+
+This version fixes the behaviour of glob (see [`77b7cc0`](https://github.com/rzk-lang/rzk/commit/77b7cc0494fe0bfd1c9f1aa83db20f42cfda5794)).
+
 ## v0.5.5 — 2023-09-19
 
 This version contains Unicode and tope logic-related fixes:

diff --git a/rzk/ChangeLog.md b/rzk/ChangeLog.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the
 [Haskell Package Versioning Policy](https://pvp.haskell.org/).
 
+## v0.5.6 — 2023-09-19
+
+This version fixes the behaviour of glob (see [`77b7cc0`](https://github.com/rzk-lang/rzk/commit/77b7cc0494fe0bfd1c9f1aa83db20f42cfda5794)).
+
 ## v0.5.5 — 2023-09-19
 
 This version contains Unicode and tope logic-related fixes:

diff --git a/rzk/package.yaml b/rzk/package.yaml
@@ -1,5 +1,5 @@
 name: rzk
-version: 0.5.5
+version: 0.5.6
 github: "rzk-lang/rzk"
 license: BSD3
 author: "Nikolai Kudasov"

diff --git a/rzk/rzk.cabal b/rzk/rzk.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           rzk
-version:        0.5.5
+version:        0.5.6
 synopsis:       An experimental proof assistant for synthetic ∞-categories
 description:    Please see the README on GitHub at <https://github.com/rzk-lang/rzk#readme>
 category:       Dependent Types

diff --git a/rzk/rzk.nix b/rzk/rzk.nix
@@ -4,7 +4,7 @@
 }:
 mkDerivation {
   pname = "rzk";
-  version = "0.5.5";
+  version = "0.5.6";
   src = ./.;
   isLibrary = true;
   isExecutable = true;

diff --git a/rzk/src/Rzk/Main.hs b/rzk/src/Rzk/Main.hs
@@ -7,6 +7,7 @@ module Rzk.Main where
 import           Control.Monad                (forM)
 import qualified Data.Aeson                   as JSON
 import qualified Data.ByteString.Lazy.Char8   as ByteString
+import           Data.List                    (sort)
 import           Data.Version                 (showVersion)
 import           Options.Generic
 import           System.Exit                  (exitFailure)
@@ -58,7 +59,7 @@ globNonEmpty :: FilePath -> IO [FilePath]
 globNonEmpty path = do
   glob path >>= \case
     []    -> error ("File(s) not found at " <> path)
-    paths -> return paths
+    paths -> return (sort paths)
 
 parseRzkFilesOrStdin :: [FilePath] -> IO [(FilePath, Rzk.Module)]
 parseRzkFilesOrStdin = \case
@@ -69,7 +70,7 @@ parseRzkFilesOrStdin = \case
   -- otherwise — parse all given files in given order
   paths -> do
     expandedPaths <- foldMap globNonEmpty paths
-    forM (reverse expandedPaths) $ \path -> do
+    forM expandedPaths $ \path -> do
       putStrLn ("Loading file " <> path)
       result <- Rzk.parseModule <$> readFile path
       case result of