Merge pull request #703 from serokell/krendelhoff/chore-v18.0-rc1-hotfix

[Chore] v18.0-rc1 hotfixes

docker/package/scripts/build-binary.sh

@@ -14,18 +14,14 @@ binary_name="$2"
 cd tezos
 opam init local ../opam-repository --bare --disable-sandboxing
 opam switch create . --repositories=local --no-install
+
 eval "$(opam env)"
-opams=()
-while IFS=  read -r -d $'\0'; do
-    # we exclude optional development packages
-    if [ "$REPLY" != "./opam/virtual/octez-dev-deps.opam" ]; then
-        opams+=("$REPLY")
-    fi
-done < <(find ./vendors ./src ./tezt ./opam -name \*.opam -print0)
+OPAMASSUMEDEPEXTS=true opam install conf-rust conf-rust-2021
+
 export CFLAGS="-fPIC ${CFLAGS:-}"
-opam install "${opams[@]}" --deps-only --criteria="-notuptodate,-changed,-removed"
-eval "$(opam env)"
+opam install opam/virtual/octez-deps.opam --deps-only --criteria="-notuptodate,-changed,-removed"
 
+eval "$(opam env)"
 dune build "$dune_filepath"
 cp "./_build/default/$dune_filepath" "../$binary_name"
 cd ..

flake.nix

@@ -35,7 +35,7 @@
       path = inputs.tezos;
       name = "tezos";
       # we exclude optional development packages
-      filter = path: _: baseNameOf path != "octez-dev-deps.opam";
+      filter = path: _: !(builtins.elem (baseNameOf path) [ "octez-dev-deps.opam" "tezos-time-measurement.opam" ]);
     };
     sources = { inherit tezos; inherit (inputs) opam-repository; };
 

meta.json

@@ -1,5 +1,5 @@
 {
-  "release": "2",
+  "release": "1",
   "maintainer": "Serokell <[email protected]>",
   "tezos_ref": "v18.0-rc1"
 }

nix/build/ocaml-overlay.nix

@@ -13,7 +13,6 @@ with opam-nix.lib.${self.system}; let
   octezSourcesResolved =
     self.runCommand "resolve-octez-sources" {} ''
       cp --no-preserve=all -Lr ${sources.tezos} $out
-      cp ${./tezos-event-logging.opam} $out/opam/tezos-event-logging.opam
     '';
   octezScope = buildOpamProject' {
     repos = with sources; [opam-repository];