update flake and dockerfile to support newer opam-repo

Author: bleepbloopsify

buildkite/src/Constants/ContainerImages.dhall

@@ -5,22 +5,22 @@
 { toolchainBase = "codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBookworm =
  { amd64 =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:0c2764790ae18788b97a9c6361d7c4b0a96c515d176226868d929415e24f8251"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:dfa8a0eb32742900d890590875a7f7436545cd46d8c4ff147fc6a29997e5d4f3"
  , arm64 =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:deb63964399029d681e39ac4ff529616b179c72fff3a0ab350e11a7099f6f23d"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:8e92e0b4c9202e0e5f31afd48713d28bde903959ff7e55cbc1c080b0a8df5e3d"
  }
 , minaToolchainBullseye.amd64 =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:db00940ea2c778592a520da755388014231db52aa2d89e0c853abfafc4fa5846"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:bcc6b9899d5d99c83287c2735fb686a6169268d48b11262d9dfa03c1dfd0cece"
 , minaToolchainNoble =
  { amd64 =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:669c4053d2f3b7ecf5787b9dc0d908b7061c8a8908dcc766c4de57bcd1c67fa1"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:0c6f1c0921c7f76be7b86948e1f9e82d8270002fc19f0b48647bb1604489268f"
  , arm64 =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:2a71e234ca0cc42a663e42daabef3736207fd91bac414b2d511b30b336529b74"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:182f0aa05988c5a00cc1ca5a5b651904282f3a0f7cd75faabe0a52e7d332cecb"
  }
 , minaToolchainJammy.amd64 =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:b16023b65bb90fc2242c83b7c9f3f3c62aca521f316a16a45f5f7cb115e95f15"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:a3e5c7dc30c67d8a9769deee282f0b5b2a513629bf272aa9b9ec7d6aee68a4e4"
 , minaToolchain =
- "gcr.io/o1labs-192920/mina-toolchain@sha256:db00940ea2c778592a520da755388014231db52aa2d89e0c853abfafc4fa5846"
+ "gcr.io/o1labs-192920/mina-toolchain@sha256:bcc6b9899d5d99c83287c2735fb686a6169268d48b11262d9dfa03c1dfd0cece"
 , postgres = "postgres:12.4-alpine"
 , xrefcheck =
  "dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

dockerfiles/stages/1-build-deps

@@ -45,6 +45,7 @@ ARG OPAM_VERSION=2.3.0
 # `nix flake update opam-repository`).
 # - scripts/update_opam_switch.sh
 ARG OPAM_REPOSITORY_COMMIT=08d8c16c16dc6b23a5278b06dff0ac6c7a217356
+ARG O1LABS_OPAM_REPOSITORY_COMMIT=cabde639f92d259d4c131b00200d7a53d854ee74
 
 # Golang version number used to detemine tarball name
 ARG GO_VERSION=1.19.11
@@ -189,10 +190,12 @@ RUN opam init --disable-sandboxing \
  -k git \
  -a /home/opam/opam-repository \
  --bare
+# We pin the opam-repo SHA so this step gets 
+# cache-busted when we update the opam repo
 RUN opam repository add --yes \
  --all \
  --set-default o1-labs \
- https://github.com/o1-labs/opam-repository.git \
+ https://github.com/o1-labs/opam-repository.git#${O1LABS_OPAM_REPOSITORY_COMMIT} \
  && opam switch create "${OCAML_VERSION}${OCAML_REVISION}" \
  "${OCAML_PACKAGE}${OCAML_VERSION}${OCAML_REVISION}${OCAML_VARIANT}" \
  && opam switch "${OCAML_VERSION}${OCAML_REVISION}"

flake.lock

@@ -31,7 +31,7 @@
  inputs.describe-dune.inputs.nixpkgs.follows = "nixpkgs";
  inputs.describe-dune.inputs.flake-utils.follows = "utils";
 
- inputs.o1-opam-repository.url = "github:o1-labs/opam-repository";
+ inputs.o1-opam-repository.url = "github:o1-labs/opam-repository/cabde639f92d259d4c131b00200d7a53d854ee74";
  inputs.o1-opam-repository.flake = false;
 
  # The version must be the same as the version used in:

flake.nix

@@ -18,9 +18,7 @@
 
 (rule
  (enabled_if
- (and
- (<> %{env:RUST_TARGET_FEATURE_OPTIMISATIONS=y} n)
- (<> %{architecture} arm64)))
+ (<> %{env:RUST_TARGET_FEATURE_OPTIMISATIONS=y} n))
  (targets rustflags.sexp)
  (action
  (with-stdout-to
@@ -29,24 +27,13 @@
 
 (rule
  (enabled_if
- (and
- (= %{env:RUST_TARGET_FEATURE_OPTIMISATIONS=y} n)
- (<> %{architecture} arm64)))
+ (= %{env:RUST_TARGET_FEATURE_OPTIMISATIONS=y} n))
  (targets rustflags.sexp)
  (action
  (with-stdout-to
  rustflags.sexp
  (echo "-C target-feature=-bmi2,-adx"))))
 
-(rule
- (enabled_if
- (= %{architecture} arm64))
- (targets rustflags.sexp)
- (action
- (with-stdout-to
- rustflags.sexp
- (echo ""))))
-
 ;;
 ;; rules to build the static library for kimchi
 ;;