Merge pull request #577 from serokell/krendelhoff/chore-remove-dev-deps

Remove dev deps v15.1 release hotfix

docker/package/scripts/build-binary.sh

@@ -17,7 +17,10 @@ opam switch create . --repositories=local --no-install
 eval "$(opam env)"
 opams=()
 while IFS=  read -r -d $'\0'; do
-    opams+=("$REPLY")
+    # 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)
 export CFLAGS="-fPIC ${CFLAGS:-}"
 opam install "${opams[@]}" --deps-only --criteria="-notuptodate,-changed,-removed"

flake.nix

@@ -26,10 +26,16 @@
   outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, flake-utils, serokell-nix, nix, ... }:
   let
     pkgs-darwin = nixpkgs-unstable.legacyPackages."aarch64-darwin";
-
     protocols = nixpkgs.lib.importJSON ./protocols.json;
     meta = nixpkgs.lib.importJSON ./meta.json;
-    sources = { inherit (inputs) tezos opam-repository; };
+
+    tezos = builtins.path {
+      path = inputs.tezos;
+      name = "tezos";
+      # we exclude optional development packages
+      filter = path: _: baseNameOf path != "octez-dev-deps.opam";
+    };
+    sources = { inherit tezos; inherit (inputs) opam-repository; };
 
     ocaml-overlay = import ./nix/build/ocaml-overlay.nix (inputs // { inherit sources protocols meta; });
   in pkgs-darwin.lib.recursiveUpdate

nix/build/ocaml-overlay.nix

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