From d76082b13068dbc21b8e3d160229539546be0499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Kr=C3=BCger?= <ole.kruger@trili.tech>
Date: Mon, 27 Jan 2025 11:46:03 +0000
Subject: [PATCH] Nix: Use pinned stdcompat

---
 images/ci/scripts/create_opam_repo.sh | 7 +------
 nix/overlays.nix                      | 5 +++++
 opam/virtual/stdcompat.opam.locked    | 5 ++++-
 shell.nix                             | 5 +++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/images/ci/scripts/create_opam_repo.sh b/images/ci/scripts/create_opam_repo.sh
index 18d145f902e5..8ce99c467c7b 100755
--- a/images/ci/scripts/create_opam_repo.sh
+++ b/images/ci/scripts/create_opam_repo.sh
@@ -89,12 +89,7 @@ OPAMSOLVERTIMEOUT=600 opam admin filter --yes --resolve \
 rm -rf packages/"$dummy_pkg" packages/octez-deps
 
 echo "Add safer hashes."
-NOHASHLIST="stdcompat"
 opam admin list --short | while read -r line ; do
-    if echo "$NOHASHLIST" | grep -qw "$line"; then
-        echo "No hash for $line"
-    else
-        opam admin add-hashes sha256 sha512 -p $line
-    fi
+  opam admin add-hashes sha256 sha512 -p $line
 done
 cd ..
diff --git a/nix/overlays.nix b/nix/overlays.nix
index c1ee9b499c67..1cb2031b4ceb 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -9,6 +9,11 @@
   pick-latest-packages = final: prev:
     prev.repository.select {
       opams = [
+        {
+          name = "stdcompat";
+          opam = ../opam/virtual/stdcompat.opam.locked;
+          version = "19";
+        }
         {
           name = "octez-deps";
           opam = ../opam/virtual/octez-deps.opam.locked;
diff --git a/opam/virtual/stdcompat.opam.locked b/opam/virtual/stdcompat.opam.locked
index b48c442510c4..fdf95134d837 100644
--- a/opam/virtual/stdcompat.opam.locked
+++ b/opam/virtual/stdcompat.opam.locked
@@ -21,5 +21,8 @@ dev-repo: "git+https://github.com/thierry-martinez/stdcompat.git"
 version: "19"
 name: "stdcompat"
 url {
-  src: "git+https://github.com/thierry-martinez/stdcompat.git"
+  src: "https://github.com/thierry-martinez/stdcompat/archive/d53390d788027fe0a2282c4745eb3d1626341f99.tar.gz"
+  checksum: [
+    "sha256=1324c4c5a2fdcefe254459f81083dedd1e6dd61efe59498e9b4aa27d5e0a3d4d"
+  ]
 }
diff --git a/shell.nix b/shell.nix
index 850bfe527ece..b861b5dffb8d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -43,6 +43,11 @@
       (final: prev:
         prev.repository.select {
           opams = [
+            {
+              name = "stdcompat";
+              opam = ./opam/virtual/stdcompat.opam.locked;
+              version = "19";
+            }
             {
               name = "octez-deps";
               opam = ./opam/virtual/octez-deps.opam.locked;
-- 
GitLab