diff --git a/images/ci/scripts/create_opam_repo.sh b/images/ci/scripts/create_opam_repo.sh index 18d145f902e58af2e14b8cf6fd46fb91e9a1eefd..8ce99c467c7bf9c58b2d7ce8c5c1121d9a3df5f3 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 c1ee9b499c67307d6702b75e876f48a611b0b29b..1cb2031b4ceb6f00ae5ddfbc86195b620a3f6677 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 b48c442510c432fff9b470dc40b5c4fc758fc5a1..fdf95134d837019c6836fb0202e548a4734c962c 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 850bfe527ece61cda6e428223af789e1450b75d4..b861b5dffb8d71d31b615d9046e9a2a6f20d631f 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;