diff --git a/Makefile b/Makefile index 474063da725e2f4986fd8c5c564a26e2f051c02a..8d615e4b2c9081e20b16fb3931cea5ef951c540c 100644 --- a/Makefile +++ b/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: ; diff --git a/descr b/descr deleted file mode 100644 index 5a8a5a0e57e0fa3c105bb39204538f814a872bfc..0000000000000000000000000000000000000000 --- a/descr +++ /dev/null @@ -1 +0,0 @@ -This is the Coq development of the Iris Project. diff --git a/opam b/opam index 4d03209501468e6e7d3deb1d7862ea55d56b2d83..0a02667e3c8438a05f2ddae3ede18b32fb3adcef 100644 --- a/opam +++ b/opam @@ -1,16 +1,18 @@ -opam-version: "1.2" +opam-version: "2.0" name: "coq-iris" -synopsis: "This is the Coq development of the Iris Project" maintainer: "Ralf Jung <jung@mpi-sws.org>" authors: "The Iris Team" homepage: "http://iris-project.org/" bug-reports: "https://gitlab.mpi-sws.org/iris/iris/issues" +dev-repo: "git+https://gitlab.mpi-sws.org/iris/iris.git" license: "BSD" -dev-repo: "https://gitlab.mpi-sws.org/iris/iris.git" -build: [make "-j%{jobs}%"] -install: [make "install"] -remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"] +synopsis: "This is the Coq development of the Iris Project" + depends: [ + "ocaml" "coq" { (= "8.8.2") | (>= "8.9.1" & < "8.12~") | (= "dev") } "coq-stdpp" { (= "dev.2019-11-22.2.16eb222f") | (= "dev") } ] + +build: [make "-j%{jobs}%"] +install: [make "install"]