diff --git a/CHANGELOG b/CHANGELOG index 69d2da9f24..15b6c1647b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ git-annex (8.20211124) UNRELEASED; urgency=medium already exported. * Fix locking problems when annex.pidlock is set and concurrency is enabled eg with -J. + * Fix build with ghc 9.0.1 -- Joey Hess Tue, 23 Nov 2021 15:58:27 -0400 diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index eaf0a5cc82..37d4f1e44f 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -28,6 +28,7 @@ import Utility.Metered import Annex.UUID import Utility.Env import Types.ProposedAccepted +import Utility.Hash (IncrementalVerifier) type Vault = String type Archive = FilePath @@ -175,7 +176,7 @@ store' r k b p = go =<< glacierEnv c gc u forceSuccessProcess cmd pid go' _ _ _ _ _ = error "internal" -retrieve :: Remote -> Retriever +retrieve :: forall a. Remote -> Key -> MeterUpdate -> Maybe IncrementalVerifier -> (ContentSource -> Annex a) -> Annex a retrieve = byteRetriever . retrieve' retrieve' :: forall a. Remote -> Key -> (L.ByteString -> Annex a) -> Annex a diff --git a/doc/bugs/Remote__47__Glacier.hs_build_error_GHC_9.0.1.mdwn b/doc/bugs/Remote__47__Glacier.hs_build_error_GHC_9.0.1.mdwn index 758defb8cf..4044f561c4 100644 --- a/doc/bugs/Remote__47__Glacier.hs_build_error_GHC_9.0.1.mdwn +++ b/doc/bugs/Remote__47__Glacier.hs_build_error_GHC_9.0.1.mdwn @@ -50,3 +50,4 @@ make: *** [Makefile:58: git-annex] Error 1 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) Oh absolutely. This version compiles fine under alpine 5.14, which uses GHC 8.8.4. I've been using this software for many years without major issues, and it's a linchpin of my backup infrastructure. Thanks for the all the good work! +> [[fixed|done]] --[[Joey]]