diff options
-rw-r--r-- | changelog.md | 1 | ||||
-rw-r--r-- | compiler/app/Main.hs | 5 | ||||
-rw-r--r-- | compiler/package.yaml | 3 | ||||
-rw-r--r-- | flake.nix | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/changelog.md b/changelog.md index 66de4b9..07a6d3a 100644 --- a/changelog.md +++ b/changelog.md | |||
@@ -11,7 +11,6 @@ release. Releases are tracked and referred to using git tags. | |||
11 | - Bug fixes: | 11 | - Bug fixes: |
12 | - compiler: fix detection of dimensions of EXIF-rotated pictures. | 12 | - compiler: fix detection of dimensions of EXIF-rotated pictures. |
13 | Rebuild the gallery with `--rebuild-all` to purge erroneous cached data. | 13 | Rebuild the gallery with `--rebuild-all` to purge erroneous cached data. |
14 | - compiler: fix support for non-UTF8 terminals. | ||
15 | - viewer: fix theme quirks (line spacing, icon colours). | 14 | - viewer: fix theme quirks (line spacing, icon colours). |
16 | - viewer: fix ghost keyboard hints when the search panel is closed. | 15 | - viewer: fix ghost keyboard hints when the search panel is closed. |
17 | 16 | ||
diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs index a9630ce..3e6f254 100644 --- a/compiler/app/Main.hs +++ b/compiler/app/Main.hs | |||
@@ -1,7 +1,7 @@ | |||
1 | -- ldgallery - A static generator which turns a collection of tagged | 1 | -- ldgallery - A static generator which turns a collection of tagged |
2 | -- pictures into a searchable web gallery. | 2 | -- pictures into a searchable web gallery. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2019-2022 Pacien TRAN-GIRARD | 4 | -- Copyright (C) 2019-2021 Pacien TRAN-GIRARD |
5 | -- | 5 | -- |
6 | -- This program is free software: you can redistribute it and/or modify | 6 | -- This program is free software: you can redistribute it and/or modify |
7 | -- it under the terms of the GNU Affero General Public License as | 7 | -- it under the terms of the GNU Affero General Public License as |
@@ -28,7 +28,6 @@ import Data.Aeson (ToJSON) | |||
28 | import System.FilePath ((</>)) | 28 | import System.FilePath ((</>)) |
29 | import System.Directory (canonicalizePath, listDirectory) | 29 | import System.Directory (canonicalizePath, listDirectory) |
30 | import System.Console.CmdArgs | 30 | import System.Console.CmdArgs |
31 | import Main.Utf8 (withUtf8) | ||
32 | 31 | ||
33 | import Compiler | 32 | import Compiler |
34 | import Files (readDirectory, copyTo, remove) | 33 | import Files (readDirectory, copyTo, remove) |
@@ -104,7 +103,7 @@ options = Options | |||
104 | 103 | ||
105 | main :: IO () | 104 | main :: IO () |
106 | main = | 105 | main = |
107 | withUtf8 $ do | 106 | do |
108 | opts <- cmdArgs options | 107 | opts <- cmdArgs options |
109 | buildGallery opts | 108 | buildGallery opts |
110 | deployViewer opts | 109 | deployViewer opts |
diff --git a/compiler/package.yaml b/compiler/package.yaml index 539bf9d..4b749e1 100644 --- a/compiler/package.yaml +++ b/compiler/package.yaml | |||
@@ -4,7 +4,7 @@ homepage: https://ldgallery.pacien.org | |||
4 | github: "pacien/ldgallery" | 4 | github: "pacien/ldgallery" |
5 | license: AGPL-3.0-only | 5 | license: AGPL-3.0-only |
6 | author: "Pacien TRAN-GIRARD, Guillaume FOUET" | 6 | author: "Pacien TRAN-GIRARD, Guillaume FOUET" |
7 | copyright: "2019-2022 Pacien TRAN-GIRARD, Guillaume FOUET" | 7 | copyright: "2019-2021 Pacien TRAN-GIRARD, Guillaume FOUET" |
8 | 8 | ||
9 | extra-source-files: | 9 | extra-source-files: |
10 | - readme.md | 10 | - readme.md |
@@ -29,7 +29,6 @@ dependencies: | |||
29 | - safe | 29 | - safe |
30 | - time | 30 | - time |
31 | - process | 31 | - process |
32 | - with-utf8 | ||
33 | 32 | ||
34 | default-extensions: | 33 | default-extensions: |
35 | - DuplicateRecordFields | 34 | - DuplicateRecordFields |
@@ -137,6 +137,8 @@ | |||
137 | src = ./example; | 137 | src = ./example; |
138 | nativeBuildInputs = [ ldgallery ]; | 138 | nativeBuildInputs = [ ldgallery ]; |
139 | buildPhase = '' | 139 | buildPhase = '' |
140 | # Need UTF-8: https://github.com/ldgallery/ldgallery/issues/341 | ||
141 | export LC_ALL=C.UTF-8 | ||
140 | ldgallery --input-dir src --output-dir $out --with-viewer | 142 | ldgallery --input-dir src --output-dir $out --with-viewer |
141 | ''; | 143 | ''; |
142 | installPhase = ":"; | 144 | installPhase = ":"; |