From e2c2f8fa91a550cb8adb69ff43c9608f5c0b2135 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 1 Dec 2016 13:24:59 +0100
Subject: [PATCH] *oops* those Makefile changes were not supposed to be
committed...
---
Makefile | 3 ++-
build/opam-ci.sh | 4 ++--
opam.pins | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index d7f957a6..68115fe3 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,9 @@ Makefile.coq: _CoqProject 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
opam pin add coq-lambda-rust "$$(pwd)#HEAD" -k git -n -y
- opam install coq-lambda-rust --deps-only --criteria="-removed,-notuptodate" $(YLFAG)
+ opam install coq-lambda-rust --deps-only $(YLFAG)
opam pin remove coq-lambda-rust
# some fiels that do *not* need to be forwarded to Makefile.coq
diff --git a/build/opam-ci.sh b/build/opam-ci.sh
index e9525736..bae8b6cb 100755
--- a/build/opam-ci.sh
+++ b/build/opam-ci.sh
@@ -16,12 +16,12 @@ test -d "$OPAMROOT/repo/coq-released" || opam repo add coq-released https://coq.
opam update
opam install ocamlfind -y # Remove this once the Coq crew fixed their package...
-# Install fixed versions of some dependencies
+# Fix versions of some dependencies
echo
for PIN in "${@}"
do
echo "Applying pin: $PIN"
- opam pin add $PIN -k version -y
+ opam pin add $PIN -k version -y -n
done
# Install build-dependencies
diff --git a/opam.pins b/opam.pins
index fae78326..1e8b61f4 100644
--- a/opam.pins
+++ b/opam.pins
@@ -1 +1 @@
-coq-iris https://gitlab.mpi-sws.org/FP/iris-coq fd42adfe6236b6bebacb963e8fed3f7d1f935e26
+coq-iris https://gitlab.mpi-sws.org/FP/iris-coq 86315b423a2bf8826a6d63a90630a239ad3d1823
--
GitLab