Fix a build failure with ghc 9.2.2

Thanks, gnezdo for the patch.

diff --git a/CHANGELOG b/CHANGELOG
index 5c1ae06361bb987f546ecf9468d87f3f26373d32..263da8e6eadb830379bbf3189c03e919b8c2f48a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@ git-annex (10.20220323) UNRELEASED; urgency=medium
   * multicast: Support uftp 5.0 by switching from aes256-cbc to
     aes256-gcm.
   * Fix test failure on NFS when cleaning up gpg temp directory.
+  * Fix a build failure with ghc 9.2.2.
+    Thanks, gnezdo for the patch.
 
  -- Joey Hess <id@joeyh.name>  Mon, 28 Mar 2022 14:46:10 -0400
 

diff --git a/Types/Export.hs b/Types/Export.hs
index a5cb173e523446b6932b7bb801cad00ec78d2c52..2d5419b91c90586afdc6b3c3ee1e7f16b8c15925 100644 (file)
--- a/Types/Export.hs
+++ b/Types/Export.hs
@@ -21,7 +21,7 @@ import Git.FilePath
 import Utility.Split
 import Utility.FileSystemEncoding
 
-import Data.ByteString.Short as S
+import qualified Data.ByteString.Short as S
 import qualified System.FilePath.Posix as Posix
 import GHC.Generics
 import Control.DeepSeq

diff --git a/doc/bugs/No_viable_build_plan_for_ghc_9.2.2/comment_1_8e7f9605f05880899eba7eae4e6f7ea0._comment b/doc/bugs/No_viable_build_plan_for_ghc_9.2.2/comment_1_8e7f9605f05880899eba7eae4e6f7ea0._comment
new file mode 100644 (file)
index 0000000..7c13f68
--- /dev/null
+++ b/doc/bugs/No_viable_build_plan_for_ghc_9.2.2/comment_1_8e7f9605f05880899eba7eae4e6f7ea0._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2022-05-02T18:13:47Z"
+ content="""
+I've applied the patch to git-annex to qualify the export.
+
+That failing test is an unrelated and now fixed bug.
+
+I can't do much more about the dependencies needing updates. Aside from
+maintaining them myself, which I kind of have been with aws to an extent,
+but not enough to be able to cut a new release with the fix.
+"""]]