From 689d099460fb9ce07e27b16bc02c117a13604c66 Mon Sep 17 00:00:00 2001 From: Aaron Siddhartha Mondal Date: Fri, 30 Aug 2024 04:00:19 +0200 Subject: [PATCH] Fix nix2container skopeo patch hash (#1294) A change in GitHub's hashing scheme caused this to evaluate differently. Add a temporary override to nix2container to unbreak CI. --- flake.lock | 7 ++++--- flake.nix | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 64a019ae3..171518fcf 100644 --- a/flake.lock +++ b/flake.lock @@ -126,16 +126,17 @@ ] }, "locked": { - "lastModified": 1720642556, - "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=", + "lastModified": 1724912665, + "narHash": "sha256-29cabSYFmIIfIR29ReoJsrvC95gtxmzQeEnFRlcLdH0=", "owner": "nlewo", "repo": "nix2container", - "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4", + "rev": "80e34774e5904aae7a3542bc3b70dab1fe048587", "type": "github" }, "original": { "owner": "nlewo", "repo": "nix2container", + "rev": "80e34774e5904aae7a3542bc3b70dab1fe048587", "type": "github" } }, diff --git a/flake.nix b/flake.nix index c9f504d0d..0b314d09e 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix2container = { - url = "github:nlewo/nix2container"; + # TODO(aaronmondal): Remove this once it lands in nix2container main. + url = "github:nlewo/nix2container/80e34774e5904aae7a3542bc3b70dab1fe048587"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; };