diff --git a/smos-calendar-import/package.yaml b/smos-calendar-import/package.yaml
index a7840b98..740034b2 100644
--- a/smos-calendar-import/package.yaml
+++ b/smos-calendar-import/package.yaml
@@ -1,5 +1,5 @@
name: smos-calendar-import
-version: 0.5.0
+version: 0.6.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-calendar-import/smos-calendar-import.cabal b/smos-calendar-import/smos-calendar-import.cabal
index d60859fa..3896f6f7 100644
--- a/smos-calendar-import/smos-calendar-import.cabal
+++ b/smos-calendar-import/smos-calendar-import.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-calendar-import
-version: 0.5.0
+version: 0.6.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-docs-site/content/changelogs/2022-09-26.markdown b/smos-docs-site/content/changelogs/2022-09-26.markdown
new file mode 100644
index 00000000..c607d6de
--- /dev/null
+++ b/smos-docs-site/content/changelogs/2022-09-26.markdown
@@ -0,0 +1,24 @@
+- [smos 0.6.0](#smos-0.6.0)
+- [smos-calendar-import 0.6.0](#smos-calendar-import-0.6.0)
+- [smos-query 0.8.0](#smos-query-0.8.0)
+- [smos-scheduler 0.5.0](#smos-scheduler-0.5.0)
+- [smos-server 0.10.0](#smos-server-0.10.0)
+- [smos-web-server 0.9.0](#smos-web-server-0.9.0)
+
+### Added
+
+* The home manager module now does a config check for `smos-query`, `smos-scheduler` and `smos-notify` during activation.
+* The home manager module now does an extra local backup during activation.
+* Editor integration: You can now use `vim` or `emacs` to edit the contents of an entry.
+* Sandbox mode, so the editor integration cannot do damage in the web version.
+
+### Changed
+
+* All packages: Upgraded to `lts-19.6` and nixpkgs branch `nixos-22.05`
+* `smos-scheduler`: Allow the schedule template to be specified as an absolute path as well.
+* `smos-query`: Fixed that the agenda entries in smos-query had incorrect
+ pretty relative days for timestamps with a day-level granularity.
+* `smos-query`: Improved metavars for optparse documentation.
+* `smos-web-server`: Change the `TUIR` and `TUIInstanceR` routes to not accept any path.
+* `smos-web-server`: Use `playground.smos` in the playground instead of `example.smos`.
+* `smos-web-server`: Open the editor in the workflow directory by default, instead of `example.smos`.
diff --git a/smos-docs-site/content/pages/development/release-checklist.markdown b/smos-docs-site/content/pages/development/release-checklist.markdown
index b838e0b7..2975d9d7 100644
--- a/smos-docs-site/content/pages/development/release-checklist.markdown
+++ b/smos-docs-site/content/pages/development/release-checklist.markdown
@@ -9,11 +9,11 @@ When a given commit on the `development` branch is supposedly ready for release,
1. Make sure that the version number of the data format has been changed if the data format has been changed.
1. Make sure that the version number of the API has been changed if the API has been changed.
1. Add new release section in the changelog.
-1. Run `stack runhaskell scripts/gen-changelog-release-section.hs` to add all the version numbers to the changelog.
+1. Run `nix-shell --run 'stack runhaskell scripts/gen-changelog-release-section.hs'` to add all the version numbers to the changelog.
1. Make sure that CI passes, remotely as well as with `ci.nix`.
1. Make a release candidate commit.
1. Merge `development` into `release`.
-1. Run the release script to create the appropriate tags: `stack runhaskell scripts/make-release-tags.hs`.
+1. Run the release script to create the appropriate tags: `nix-shell --run 'stack runhaskell scripts/make-release-tags.hs'`.
1. Push to github with `git push`.
1. Push the tags with `git push --tags`
1. Make a GitHub release with the contents of the changelog using `nix-shell --run ./scripts/make-github-release.sh`.
diff --git a/smos-docs-site/content/unreleased.markdown b/smos-docs-site/content/unreleased.markdown
index f9300b39..e69de29b 100644
--- a/smos-docs-site/content/unreleased.markdown
+++ b/smos-docs-site/content/unreleased.markdown
@@ -1,16 +0,0 @@
-### Added
-
-* The home manager module now does a config check for `smos-query`, `smos-scheduler` and `smos-notify` during activation.
-* The home manager module now does an extra local backup during activation.
-* Editor integration: You can now use `vim` or `emacs` to edit the contents of an entry.
-* Sandbox mode, so the editor integration cannot do damage in the web version.
-
-### Changed
-
-* `smos-scheduler`: Allow the schedule template to be specified as an absolute path as well.
-* `smos-query`: Fixed that the agenda entries in smos-query had incorrect
- pretty relative days for timestamps with a day-level granularity.
-* `smos-query`: Improved metavars for optparse documentation.
-* `smos-web-server`: Change the `TUIR` and `TUIInstanceR` routes to not accept any path.
-* `smos-web-server`: Use `playground.smos` in the playground instead of `example.smos`.
-* `smos-web-server`: Open the editor in the workflow directory by default, instead of `example.smos`.
diff --git a/smos-docs-site/smos-docs-site.cabal b/smos-docs-site/smos-docs-site.cabal
index c23adb2f..d0278a2d 100644
--- a/smos-docs-site/smos-docs-site.cabal
+++ b/smos-docs-site/smos-docs-site.cabal
@@ -47,6 +47,7 @@ extra-source-files:
content/changelogs/2022-06-27.markdown
content/changelogs/2022-07-22.markdown
content/changelogs/2022-08-20.markdown
+ content/changelogs/2022-09-26.markdown
content/pages/blogposts.markdown
content/pages/building-installation.markdown
content/pages/cheat-sheet.markdown
diff --git a/smos-query/package.yaml b/smos-query/package.yaml
index acaea825..bf2df969 100644
--- a/smos-query/package.yaml
+++ b/smos-query/package.yaml
@@ -1,5 +1,5 @@
name: smos-query
-version: 0.7.4
+version: 0.8.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-query/smos-query.cabal b/smos-query/smos-query.cabal
index 9d429695..2464badd 100644
--- a/smos-query/smos-query.cabal
+++ b/smos-query/smos-query.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-query
-version: 0.7.4
+version: 0.8.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-scheduler/package.yaml b/smos-scheduler/package.yaml
index 18773a3d..ed4fd29e 100644
--- a/smos-scheduler/package.yaml
+++ b/smos-scheduler/package.yaml
@@ -1,5 +1,5 @@
name: smos-scheduler
-version: 0.4.0
+version: 0.5.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-scheduler/smos-scheduler.cabal b/smos-scheduler/smos-scheduler.cabal
index 64152350..35d15c60 100644
--- a/smos-scheduler/smos-scheduler.cabal
+++ b/smos-scheduler/smos-scheduler.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-scheduler
-version: 0.4.0
+version: 0.5.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-server/package.yaml b/smos-server/package.yaml
index 41b6371f..3ba0ff9d 100644
--- a/smos-server/package.yaml
+++ b/smos-server/package.yaml
@@ -1,5 +1,5 @@
name: smos-server
-version: 0.9.1
+version: 0.10.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-server/smos-server.cabal b/smos-server/smos-server.cabal
index 05a96745..96ff20c6 100644
--- a/smos-server/smos-server.cabal
+++ b/smos-server/smos-server.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-server
-version: 0.9.1
+version: 0.10.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos-web-server/package.yaml b/smos-web-server/package.yaml
index c9070e41..fcda5fb7 100644
--- a/smos-web-server/package.yaml
+++ b/smos-web-server/package.yaml
@@ -1,5 +1,5 @@
name: smos-web-server
-version: 0.8.0
+version: 0.9.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
@@ -28,7 +28,6 @@ library:
- data-default
- deepseq
- envparse
- - filepath
- http-client
- http-client-tls
- http-types
diff --git a/smos-web-server/smos-web-server.cabal b/smos-web-server/smos-web-server.cabal
index faee4b11..37e6c426 100644
--- a/smos-web-server/smos-web-server.cabal
+++ b/smos-web-server/smos-web-server.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-web-server
-version: 0.8.0
+version: 0.9.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
@@ -92,7 +92,6 @@ library
, data-default
, deepseq
, envparse
- , filepath
, http-client
, http-client-tls
, http-types
diff --git a/smos-web-server/src/Smos/Web/Server/Foundation.hs b/smos-web-server/src/Smos/Web/Server/Foundation.hs
index fa8224ae..b12b93fe 100644
--- a/smos-web-server/src/Smos/Web/Server/Foundation.hs
+++ b/smos-web-server/src/Smos/Web/Server/Foundation.hs
@@ -36,7 +36,6 @@ import Smos.Web.Server.Constants
import Smos.Web.Server.Static
import Smos.Web.Server.Widget
import Smos.Web.Style
-import qualified System.FilePath as FP
import Text.Hamlet
import Yesod
import Yesod.Auth
diff --git a/smos-web-server/src/Smos/Web/Server/Handler/TUI.hs b/smos-web-server/src/Smos/Web/Server/Handler/TUI.hs
index cd6bf331..d62109fe 100644
--- a/smos-web-server/src/Smos/Web/Server/Handler/TUI.hs
+++ b/smos-web-server/src/Smos/Web/Server/Handler/TUI.hs
@@ -8,7 +8,6 @@ module Smos.Web.Server.Handler.TUI
)
where
-import qualified Data.Text as T
import Smos.Web.Server.Handler.Import
getTUIR :: Handler Html
diff --git a/smos/package.yaml b/smos/package.yaml
index 7201af6f..b5f9bc5e 100644
--- a/smos/package.yaml
+++ b/smos/package.yaml
@@ -1,5 +1,5 @@
name: smos
-version: 0.5.2
+version: 0.6.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos/smos.cabal b/smos/smos.cabal
index 3e310e64..6cb28544 100644
--- a/smos/smos.cabal
+++ b/smos/smos.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos
-version: 0.5.2
+version: 0.6.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
diff --git a/smos/test_resources/e2e/conv-done-and-wait-for-response-undo.yaml b/smos/test_resources/e2e/conv-done-and-wait-for-response-undo.yaml
index 6a6f8ae6..3ca78e71 100644
--- a/smos/test_resources/e2e/conv-done-and-wait-for-response-undo.yaml
+++ b/smos/test_resources/e2e/conv-done-and-wait-for-response-undo.yaml
@@ -2,6 +2,6 @@ before:
- hello
commands:
- ' nw'
-- 'u'
+- 'u'
after:
- hello