Merge branch 'master' of ssh://git-annex.branchable.com

doc/bugs/git-annex_does_not_build_reproducibly_from_readdir_order/comment_4_a338f3831c6dc6f3f0ba2e8b6657a262._comment

@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="https://bmwiedemann.zq1.de/"
+ avatar="http://cdn.libravatar.org/avatar/96f3cd71c3d677f31ed8f79ffb8fb343a8282c085731f405997ff3ef77a1a71b"
+ subject="comment 4"
+ date="2020-06-30T19:47:35Z"
+ content="""
+That is closer, but those diffs in Assistant/WebApp/Types.o seem to still be something different.
+
+Since strings in Types.o varied around the embedded static/activityicon.gif, I noticed that Assistant/WebApp/Types.hs had lines like
+
+```
+publicFiles \"static\"
+staticRoutes = $(embed \"static\")
+```
+
+Could it be, that those indirectly iterate over listings of the static/ dir without sorting to generate those lists of filenames embedded in Types.o?
+
+Maybe via <https://hackage.haskell.org/package/yesod-static> ?
+e.g. <https://github.com/yesodweb/yesod/blob/master/yesod-static/Yesod/Static.hs#L250> . That file has more occurrences of fs and none of sort.
+"""]]

doc/bugs/stack_build_failure_with_recent_update.mdwn

@@ -0,0 +1,63 @@
+On 10abf964f (add new deps, 2020-06-30), `stack build` fails for me
+with
+
+```
+/home/kyle/src/haskell/git-annex/git-lfs 1.1.0/: getDirectoryContents:openDirStream: does not exist (No such file or directory)
+```
+
+I think this is due to a hyphen missing before the version.  I've
+added those locally to stack.yaml (assuming that's correct,
+stack-lts-12.14.yaml should of course get the same update).
+
+[[!format diff """
+diff --git a/stack.yaml b/stack.yaml
+index 8724904f8..0a65a66b6 100644
+--- a/stack.yaml
++++ b/stack.yaml
+@@ -24,8 +24,8 @@ extra-deps:
+  - sandi-0.5
+  - tasty-rerun-1.1.17
+  - torrent-10000.1.1
+- - git-lfs 1.1.0
+- - http-client-restricted 0.0.2
++ - git-lfs-1.1.0
++ - http-client-restricted-0.0.2
+ explicit-setup-deps:
+   git-annex: true
+ resolver: lts-14.27
+"""]]
+
+
+After doing that, it looks like there is a dependency mismatch that
+can't be resolved:
+
+```
+Error: While constructing the build plan, the following exceptions were encountered:
+
+In the dependencies for http-client-restricted-0.0.2:
+    http-client-0.6.4 from stack configuration does not match >=0.5 && <0.6  (latest matching version
+                      is 0.5.14)
+needed due to git-annex-8.20200617 -> http-client-restricted-0.0.2
+
+Some different approaches to resolving this:
+
+  * Set 'allow-newer: true'
+    in /home/kyle/.stack/config.yaml to ignore all version constraints and build anyway.
+
+  * Recommended action: try adding the following to your extra-deps
+    in /home/kyle/src/haskell/git-annex/stack.yaml:
+
+- http-client-0.5.14@sha256:4880b27d6741e331454a1d4c887d96ce3d7d625322c8433983a4b1cd08538577,5348
+
+Plan construction failed.
+```
+
+Here's my stack version, which is running on top of Debian Buster:
+
+```
+$ stack --version
+Version 2.3.1, Git revision de2a7b694f07de7e6cf17f8c92338c16286b2878 (8103 commits) x86_64 hpack-0.33.0
+```
+
+Locally, I've set `httpclientrestricted` and `gitlfs` flags to false
+to use the vendored version for now.