From 68a992390354db39d68a64ce70efdbe40d57cc82 Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@digitallyinduced.com>
Date: Tue, 2 Jan 2024 12:22:40 +0100
Subject: [PATCH] Fixed cache issue during build

---
 .github/patch-flakes.php    | 2 +-
 .github/workflows/build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/patch-flakes.php b/.github/patch-flakes.php
index 0d614a4c8..d8ad1828f 100644
--- a/.github/patch-flakes.php
+++ b/.github/patch-flakes.php
@@ -1,6 +1,6 @@
 <?php
 $file_contents = file_get_contents('./flake.nix');
-$new_content_with_ref = preg_replace('/(ihp\.url = \")(.+)(\")/', '$1github:' . $argv[2] . '?ref=' . $argv[1] . '$3', $file_contents);
+$new_content_with_ref = preg_replace('/(ihp\.url = \")(.+)(\")/', '$1github:' . $argv[2] . '?ref=' . $argv[1] . '&rev=' . $argv[3] . '$3', $file_contents);
 $new_content_with_ref = str_replace("p.ihp", "p.ihp wreq mmark mmark-ext strip-ansi-escape stripe-signature stripe-concepts http-conduit aeson-casing tz tagsoup ihp-zip minio-hs hs-brotli wai-middleware-brotli fakedata jwt ihp-openai ihp-graphql unordered-containers minimorph", $new_content_with_ref);
 $new_content_with_ref = str_replace("# Native dependencies, e.g. imagemagick", "nodejs imagemagick elmPackages.elm", $new_content_with_ref);
 file_put_contents('./flake.nix', $new_content_with_ref);
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3fb051da..ab2eb1046 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
       if: matrix.os != 'ARM64'
     - run: |
           cd ihp-boilerplate
-          php ../.github/patch-flakes.php ${{ github.ref }} ${{ github.event.repository.full_name }}
+          php ../.github/patch-flakes.php ${{ github.ref }} ${{ github.event.repository.full_name }} ${{ github.sha }}
           cat flake.nix
           mv Makefile Makefile.old
           echo 'GHC_OPTIONS+= -rtsopts=all\n.SHELLFLAGS := -eu -o pipefail -c\n\n'|cat - Makefile.old > Makefile