diff --git a/CHANGELOG b/CHANGELOG index 756459998d..c26e0eca4d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,8 @@ git-annex (7.20190731) UNRELEASED; urgency=medium newlines. * Windows installer: Always install to 64 bit program files directory, since it needs 64 bit git now. + * Build with silently-1.2.5.1 on Windows; the old one used "NUL" which + is not supported with recent versions of ghc. -- Joey Hess Thu, 01 Aug 2019 00:11:56 -0400 diff --git a/doc/bugs/test_suite_fails_on_windows/comment_2_4e8d054e01ec9678d90e90f15b1da8a6._comment b/doc/bugs/test_suite_fails_on_windows/comment_2_4e8d054e01ec9678d90e90f15b1da8a6._comment new file mode 100644 index 0000000000..1bf02ba58b --- /dev/null +++ b/doc/bugs/test_suite_fails_on_windows/comment_2_4e8d054e01ec9678d90e90f15b1da8a6._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2019-08-07T21:20:58Z" + content=""" +Tracked it back to runSqliteInfo. Both that and runSqlite use NUL +somewhere. + +So the bug is in persistent-sqlite, or one of its dependencies. + +Aha! silently-1.2.5, used by persistent in runMigrationSilent, +and it's already been fixed in a point release. I've bumped the dependency, +hopefully that will fix this. +"""]] diff --git a/git-annex.cabal b/git-annex.cabal index a2e5743069..996403df00 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -393,7 +393,8 @@ Executable git-annex Win32 (>= 2.6.1.0), unix-compat (>= 0.5), setenv, - process (>= 1.6.2.0) + silently (>= 1.2.5.1) + process (>= 1.6.2.0), else Build-Depends: unix (>= 2.7.2) diff --git a/stack.yaml b/stack.yaml index cedf2d9c78..d97bf2f263 100644 --- a/stack.yaml +++ b/stack.yaml @@ -23,6 +23,7 @@ extra-deps: - torrent-10000.1.1 - sandi-0.5 - http-client-0.5.14 +- silently-1.2.5.1 explicit-setup-deps: git-annex: true resolver: lts-13.29