Merge branch 'master' of https://gitlab.mpi-sws.org/iris/actris

_CoqProject

 -Q theories actris
--arg -w -arg -notation-overridden,-redundant-canonical-projection,-several-object-files,-convert_concl_no_check,-undeclared-scope,-ambiguous-paths,-unexpected-implicit-declaration
+# We sometimes want to locally override notation, and there is no good way to do that with scopes.
+-arg -w -arg -notation-overridden
+# Cannot use non-canonical projections as it causes massive unification failures
+# (https://github.com/coq/coq/issues/6294).
+-arg -w -arg -redundant-canonical-projection
+
 theories/utils/skip.v
 theories/utils/llist.v
 theories/utils/compare.v

opam

@@ -9,5 +9,5 @@ build: [make "-j%{jobs}%"]
 install: [make "install"]
 remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/actris" ]
 depends: [
-  "coq-iris" { (= "dev.2020-07-21.2.e989ad6b") | (= "dev") }
+  "coq-iris" { (= "dev.2020-09-03.1.7dd1b9af") | (= "dev") }
 ]