From e7483ff39294bfd09e4fbacd44b2656f6f340a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Sat, 27 Jan 2018 14:54:12 +0100
Subject: [PATCH] Opam: new release of ocp-ocamlres

---
 scripts/opam-pin.sh                           | 25 +++++++++++--------
 scripts/opam-unpin.sh                         |  4 ---
 .../tezos-protocol-compiler.opam              |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/opam-pin.sh b/scripts/opam-pin.sh
index 15f0badf9..04d0a4873 100755
--- a/scripts/opam-pin.sh
+++ b/scripts/opam-pin.sh
@@ -5,10 +5,22 @@ set -e
 script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 src_dir="$(dirname "$script_dir")"
 
-opams=$(find "$src_dir" -name \*.opam -print)
-
 export OPAMYES=yes
 
+### Temporary HACK
+
+## Should be in sync with `opam-unpin.sh`
+opam pin add --no-action --dev-repo sodium
+opam pin add --no-action --dev-repo ocplib-json-typed
+
+## Unpin package we used to pin...
+opam pin remove --no-action ocp-ocamlres
+opam pin remove --no-action ocplib-resto
+
+### End of temporary HACK
+
+opams=$(find "$src_dir" -name \*.opam -print)
+
 packages=
 for opam in $opams; do
     dir=$(dirname $opam)
@@ -20,15 +32,6 @@ done
 
 packages=$(opam list --short --all --sort $packages)
 
-### Temporary HACK
-
-## Should be in sync with `opam-unpin.sh`
-opam pin add --no-action --dev-repo sodium
-opam pin add --no-action --dev-repo ocp-ocamlres
-opam pin add --no-action --dev-repo ocplib-json-typed
-
-### End of temporary HACK
-
 echo
 echo "Pinned packages:"
 echo "$packages" | sed 's/^/ /'
diff --git a/scripts/opam-unpin.sh b/scripts/opam-unpin.sh
index ab2c6af92..c52f32c55 100755
--- a/scripts/opam-unpin.sh
+++ b/scripts/opam-unpin.sh
@@ -13,10 +13,6 @@ opam pin remove $packages
 
 ## Should be in sync with `opam-pin.sh`
 opam pin remove --no-action sodium
-opam pin remove --no-action ocp-ocamlres
 opam pin remove --no-action ocplib-json-typed
 
-## Unpin package we used to pin...
-opam pin remove --no-action ocplib-resto
-
 ### End of temporary HACK
diff --git a/src/lib_protocol_compiler/tezos-protocol-compiler.opam b/src/lib_protocol_compiler/tezos-protocol-compiler.opam
index bd2aaf5cd..9ec8c1ac2 100644
--- a/src/lib_protocol_compiler/tezos-protocol-compiler.opam
+++ b/src/lib_protocol_compiler/tezos-protocol-compiler.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-environment-sigs"
   "lwt"
   "ocplib-endian"
-  "ocp-ocamlres" { >= "dev" }
+  "ocp-ocamlres" { >= "0.4" }
 ]
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]