From 280d41b58f3f5724e034dc9743b3810d7ba7fe08 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 2 May 2022 14:21:48 -0400 Subject: [PATCH] Fix a build failure with ghc 9.2.2 Thanks, gnezdo for the patch. --- CHANGELOG | 2 ++ Types/Export.hs | 2 +- ...ment_1_8e7f9605f05880899eba7eae4e6f7ea0._comment | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 doc/bugs/No_viable_build_plan_for_ghc_9.2.2/comment_1_8e7f9605f05880899eba7eae4e6f7ea0._comment diff --git a/CHANGELOG b/CHANGELOG index 5c1ae06361..263da8e6ea 100644 --- 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 Mon, 28 Mar 2022 14:46:10 -0400 diff --git a/Types/Export.hs b/Types/Export.hs index a5cb173e52..2d5419b91c 100644 --- 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 index 0000000000..7c13f68095 --- /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. +"""]] -- 2.30.2