upgrade to opam 2

Makefile

@@ -29,14 +29,8 @@ build-dep: build-dep/opam phony
 	@# that are incompatible with our build requirements.
 	@# To achieve this, we create a fake opam package that has our build-dependencies as
 	@# dependencies, but does not actually install anything itself.
-	@echo "# Pinning build-dep package." && \
-	  if opam --version | grep "^1\." -q; then \
-	    BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')" && \
-	    opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \
-	    opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE"; \
-	  else \
-	    opam install $(OPAMFLAGS) build-dep/; \
-	  fi
+	@echo "# Installing build-dep package."
+	@opam install $(OPAMFLAGS) build-dep/
 
 # Some files that do *not* need to be forwarded to Makefile.coq
 Makefile: ;

README.md

@@ -22,7 +22,7 @@ please check out the
 ## Installing Iris via opam
 
 The easiest, and recommend, way of installing Iris and its dependencies is via
-the OCaml package manager opam (1.2.2 or newer). You first have to add the Coq
+the OCaml package manager opam (2.0.0 or newer). You first have to add the Coq
 opam repository and the Iris development repository (if you have not already
 done so earlier):
 

opam

-opam-version: "1.2"
+opam-version: "2.0"
 name: "coq-iris-tutorial-popl18"
 maintainer: "The Iris Organization"
 authors: "The Iris Organization"
 homepage: "https://gitlab.mpi-sws.org/iris/tutorial-popl18"
 bug-reports: "https://gitlab.mpi-sws.org/iris/tutorial-popl18/issues"
-dev-repo: "https://gitlab.mpi-sws.org/iris/tutorial-popl18.git"
-build: [make "-j%{jobs}%"]
-install: [] # This repo does not install
-remove: []
+dev-repo: "git+https://gitlab.mpi-sws.org/iris/tutorial-popl18.git"
+
+synopsis: "A collection of case studies for Iris"
+
 depends: [
   "coq-iris" { (= "dev.2019-11-21.4.d1787db2") | (= "dev") }
 ]
+
+build: [make "-j%{jobs}%"]
+install: [] # This repo does not install