simpler overriding in bench

dev/bench/bench.sh

@@ -373,32 +373,16 @@ create_opam() {
     opam var --global jobs=$number_of_processors >/dev/null
     if [ ! -z "$BENCH_DEBUG" ]; then opam config list; fi
 
+    opam repo add -q --this-switch coq-extra-dev "$OPAM_COQ_DIR/extra-dev"
+    opam repo add -q --this-switch coq-released "$OPAM_COQ_DIR/released"
+
     local override_package
     local url_or_package
     for url_or_package in $OPAM_OVERRIDE_URLS; do
       if [ "$override_package" ]; then
         echo "Setting source url for $override_package to $url_or_package in $RUNNER"
-        local found=
-        for subrepo in extra-dev released; do
-          path=$OPAM_COQ_DIR/$subrepo/packages/${override_package%%.*}/$override_package/opam
-          if [ -e "$path" ]; then
-            found=1
-            orig=$(opam show -f url.src --raw "$path")
-            sed -i.bak "s|$orig|\"$url_or_package\"|g" "$path"
-            if ! [ "\"$url_or_package\"" = "$(opam show -f url.src --raw "$path")" ]; then
-              msg="Failed to replace url in $path"
-              >&2 echo "$msg"
-              zulip_edit "Bench failed: $msg"
-              exit 1
-            fi
-          fi
-        done
-        if ! [ "$found" ]; then
-          msg="Could not find opam file for $override_package in $RUNNER"
-          >&2 echo "$msg"
-          zulip_edit "Bench failed: $msg"
-          exit 1
-        fi
+        # NB opam editor start seems to ignore -y but works with </dev/null
+        OPAMEDITOR="echo 'url { src: \"$url_or_package\" }' >> " opam pin add -nye "$override_package" - </dev/null
         override_package=
       else
         override_package=$url_or_package
@@ -410,9 +394,6 @@ create_opam() {
       exit 1
     fi
 
-    opam repo add -q --this-switch coq-extra-dev "$OPAM_COQ_DIR/extra-dev"
-    opam repo add -q --this-switch coq-released "$OPAM_COQ_DIR/released"
-
     opam install -qy -j$number_of_processors $initial_opam_packages
     if [ ! -z "$BENCH_DEBUG" ]; then opam repo list; fi