From e646e192fdfebeffdc11aa625b09ed359f067c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Kr=C3=BCger?= <ole.kruger@trili.tech>
Date: Tue, 12 Mar 2024 14:30:40 +0000
Subject: [PATCH] Nix: Fix shell.nix and default.nix after opam-repo refactor

---
 default.nix      |  3 ++-
 nix/overlays.nix | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 9502ae93d1b7..51f91c9f1de7 100644
--- a/default.nix
+++ b/default.nix
@@ -7,11 +7,12 @@ let
 
   overlays = pkgs.callPackage ./nix/overlays.nix {};
   tezos-opam-repository = pkgs.callPackage ./nix/tezos-opam-repo.nix {};
+  opam-repository = pkgs.callPackage ./nix/opam-repo.nix {};
 
   packageSet = pkgs.opamPackages.overrideScope' (pkgs.lib.composeManyExtensions [
     # Set the opam-repository which has the package descriptions.
     (final: prev: {
-      repository = prev.repository.override {src = tezos-opam-repository;};
+      repository = prev.repository.override {src = opam-repository;};
     })
 
     # First overlay simply picks the package versions from Tezos'
diff --git a/nix/overlays.nix b/nix/overlays.nix
index 098c12941a31..7db6ba356afa 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -5,9 +5,14 @@
   pkg-config,
 }: {
   pick-latest-packages = final: prev:
-    builtins.mapAttrs
-    (name: versions: versions.latest)
-    prev.repository.packages;
+    prev.repository.select {
+      opams = [
+        {
+          name = "octez-deps";
+          opam = ../opam/virtual/octez-deps.opam.locked;
+        }
+      ];
+    };
 
   common-overlay = final: prev:
     lib.optionalAttrs (lib.hasAttr "ocaml-base-compiler" prev) {
-- 
GitLab