From 277b151ada2545b042aeed4a97cc6432055c0069 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Fri, 6 Sep 2024 13:39:42 +0200
Subject: [PATCH] update vcpkg and nixpkgs

---
 .github/workflows/build-macos.yml   | 2 +-
 .github/workflows/build-windows.yml | 4 ++--
 cmake/ConfigureVcpkg.cmake          | 2 +-
 flake.lock                          | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 9a5830e0..b2dda12d 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up vcpkg
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
+          vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da
       - name: Build
         uses: lukka/run-cmake@v10
         with:
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 5470e7b8..30dbd2a8 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - ci/vcpkg-update
+      - ci/*
   pull_request:
     branches:
       - master
@@ -27,7 +27,7 @@ jobs:
     - name: Set up vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
+        vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da
     - name: Configure
       run: cmake --preset=release-mingw-x86_64
     - name: Build
diff --git a/cmake/ConfigureVcpkg.cmake b/cmake/ConfigureVcpkg.cmake
index fa6e2b00..bd256d91 100644
--- a/cmake/ConfigureVcpkg.cmake
+++ b/cmake/ConfigureVcpkg.cmake
@@ -9,7 +9,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
     endif()
     FetchContent_Declare(vcpkg
         GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
-        GIT_TAG 2024.07.12
+        GIT_TAG 2024.08.23
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
     FetchContent_MakeAvailable(vcpkg)
 endif()
diff --git a/flake.lock b/flake.lock
index 6e99d27f..9f0fe239 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1725432240,
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
         "type": "github"
       },
       "original": {