diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81698e7654d74f0e7961c8c617a29f03345d91d2..40b918ea2929f1129e47761aaf558157d46c9a18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ build-coq.8.7.2: build-iris.dev: <<: *template variables: - OPAM_PINS: "coq version 8.8.2 coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-iris.dev git git+https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV" + OPAM_PINS: "coq version 8.8.2 coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-gpfsl.dev git git+https://gitlab.mpi-sws.org/iris/gpfsl.git#$GPFSL_REV" except: only: - triggers diff --git a/README.md b/README.md index f9e6a9b9f5e752cca64cc3ab468c04a3599fa9c3..42c571aae656f8291e1fa1229e164f26d0908508 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,14 @@ This is the Coq development accompanying RBrlx. This version is known to compile with: - - Coq 8.7.2 / 8.8.0 + - Coq 8.7.2 / 8.8.2 - A development version of [GPFSL]. The easiest way to install the correct versions of the dependencies is through opam (1.2.2 or newer). You will need the Coq and Iris opam repositories: opam repo add coq-released https://coq.inria.fr/opam/released - opam repo add iris-dev https://gitlab.mpi-sws.org/FP/opam-dev.git + opam repo add iris-dev https://gitlab.mpi-sws.org/iris/opam.git Once you got opam set up, run `make build-dep` to install the right versions of the dependencies. @@ -172,5 +172,5 @@ lifetime logic is in [lifetime_sig.v](theories/lifetime/lifetime_sig.v). * You may have to do `make clean` as Coq will likely complain about .vo file mismatches. - [GPFSL]: https://gitlab.mpi-sws.org/FP/gpfsl/ - [ORC11]: https://gitlab.mpi-sws.org/FP/orc11/ + [GPFSL]: https://gitlab.mpi-sws.org/iris/gpfsl/ + [ORC11]: https://gitlab.mpi-sws.org/iris/orc11/ diff --git a/opam b/opam index 79538f438b0d2e058ccc3259bf5ec38d9a31c382..267b9df103ee80222ac99af53b82c02390da283a 100644 --- a/opam +++ b/opam @@ -4,11 +4,11 @@ version: "dev" maintainer: "Ralf Jung <jung@mpi-sws.org>" authors: "The RustBelt Team" homepage: "http://plv.mpi-sws.org/rustbelt/" -bug-reports: "https://gitlab.mpi-sws.org/FP/lambdaRust-coq/issues" -dev-repo: "https://gitlab.mpi-sws.org/FP/lambdaRust-coq.git" +bug-reports: "https://gitlab.mpi-sws.org/iris/lambda-rust/issues" +dev-repo: "https://gitlab.mpi-sws.org/iris/lambda-rust.git" build: [make "-j%{jobs}%"] install: [make "install"] remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ] depends: [ - "coq-gpfsl" { (= "dev.2019-01-31.0.5495b101") | (= "dev") } + "coq-gpfsl" { (= "dev.2019-02-01.1.8412a96e") | (= "dev") } ]