From b0681cd793337d524279d516f3e0b014fba951fb Mon Sep 17 00:00:00 2001
From: Jan-Oliver Kaiser <janno@mpi-sws.org>
Date: Wed, 19 Apr 2017 19:07:29 +0200
Subject: [PATCH] Bump Iris to 3.0.0; remove unused pinning steps in make
build-dep.
---
coq/ra/Makefile | 4 ++--
opam | 2 +-
opam.pins | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/coq/ra/Makefile b/coq/ra/Makefile
index 5971295f..b8a6a2d0 100644
--- a/coq/ra/Makefile
+++ b/coq/ra/Makefile
@@ -22,8 +22,8 @@ Makefile.coq: _CoqProject Makefile awk.Makefile
# Install build-dependencies
build-dep:
- ../build/opam-pins.sh < ../../opam.pins
- opam upgrade $(YFLAG) # it is not nice that we upgrade *all* packages here, but I found no nice way to upgrade only those that we pinned
+ # ../build/opam-pins.sh < ../../opam.pins
+ # opam upgrade $(YFLAG) # it is not nice that we upgrade *all* packages here, but I found no nice way to upgrade only those that we pinned
opam pin add opam-builddep-temp "$$(pwd)/../..#HEAD" -k git -n -y
opam install opam-builddep-temp --deps-only $(YFLAG)
opam pin remove opam-builddep-temp
diff --git a/opam b/opam
index 69ed1f36..fffa3e0c 100644
--- a/opam
+++ b/opam
@@ -13,5 +13,5 @@ install: [make "install"]
# TODO: probably we want to install things to a different folder, "ra" is rather undescriptive
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/ra" ]
depends: [
- "coq-iris"
+ "coq-iris" { ="3.0.0." }
]
diff --git a/opam.pins b/opam.pins
index ac0de214..e69de29b 100644
--- a/opam.pins
+++ b/opam.pins
@@ -1 +0,0 @@
-coq-iris https://gitlab.mpi-sws.org/FP/iris-coq 01d12014855abe6adaea20bbb35b1e9beadff14e
--
GitLab