diff --git a/docker/package/scripts/build-binary.sh b/docker/package/scripts/build-binary.sh index 1681c144f..bb66264d7 100755 --- a/docker/package/scripts/build-binary.sh +++ b/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 .. diff --git a/flake.nix b/flake.nix index d4f995f11..71c900e8a 100644 --- a/flake.nix +++ b/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; }; diff --git a/meta.json b/meta.json index 793cf5632..b79b0d8f0 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "2", + "release": "1", "maintainer": "Serokell ", "tezos_ref": "v18.0-rc1" } diff --git a/nix/build/ocaml-overlay.nix b/nix/build/ocaml-overlay.nix index 7a9d09db3..97c5a732c 100644 --- a/nix/build/ocaml-overlay.nix +++ b/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]; diff --git a/nix/build/tezos-event-logging.opam b/nix/build/tezos-event-logging.opam deleted file mode 100644 index 650ae0bc5..000000000 --- a/nix/build/tezos-event-logging.opam +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA -opam-version: "2.0" -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -]