From eb6200d58ccd374f4aece9dcf3551efdd60c00bc Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Sun, 22 Feb 2026 15:49:17 -0500 Subject: [PATCH 1/2] vcpkg-tool: 2025-12-05 -> 2025-12-16 --- .../by-name/vc/vcpkg-tool/change-lock-location.patch | 12 ++++++------ pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch b/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch index d3cf8e0f8137..c4dc4c63c257 100644 --- a/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch +++ b/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch @@ -1,14 +1,14 @@ diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp -index 3f588c21..e6f2bbed 100644 +index bb07a8fe..7dcf9c9b 100644 --- a/src/vcpkg/vcpkgpaths.cpp +++ b/src/vcpkg/vcpkgpaths.cpp -@@ -579,7 +579,8 @@ namespace vcpkg - if (!args.do_not_take_lock) - { - std::error_code ec; +@@ -607,7 +607,8 @@ namespace vcpkg + lock_taking_context = &wdc; + } + - const auto vcpkg_root_file = root / ".vcpkg-root"; + fs.create_directories(Path{"/tmp/vcpkg"}, VCPKG_LINE_INFO); + const auto vcpkg_root_file = Path{"/tmp/vcpkg"} / Hash::get_string_sha256(root.c_str()); if (args.wait_for_lock.value_or(false)) { - file_lock_handle = fs.take_exclusive_file_lock(vcpkg_root_file, ec); + file_lock_handle = fs.take_exclusive_file_lock(*lock_taking_context, vcpkg_root_file); diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 21ae69da0b79..41b9d0adce1f 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2025-12-05"; + version = "2025-12-16"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-Sl9xs4WkydcRd5NGFGEoQEx2o+g+KAGn4UPtQ1dPpoY="; + hash = "sha256-EnKfeWRiqWVFbGc2QNT9YQHs+dlXvvri9FPVxpxpphM="; }; nativeBuildInputs = [ From 2b2e87940874bd008640e3c5adbd5507efa3ef21 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Sun, 22 Feb 2026 15:49:59 -0500 Subject: [PATCH 2/2] vcpkg: 2025.10.17 -> 2026.01.16 --- pkgs/by-name/vc/vcpkg/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 8fbbcd9b3b4a..51e63bc7955a 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2025.10.17"; + version = "2026.01.16"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; tag = finalAttrs.version; - hash = "sha256-prWpMtvXWZ53y2gzr7IIqL/5kQZRfErnynEHMqi15/A="; + hash = "sha256-fT1EADy3wXm1JIpAbOmS2LWCJCK/kbsiaN9ILgQuZek="; leaveDotGit = true; postFetch = '' cd "$out" @@ -39,12 +39,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace scripts/toolchains/linux.cmake \ - --replace-fail "aarch64-linux-gnu-as" "aarch64-unknown-linux-gnu-as" \ - --replace-fail "aarch64-linux-gnu-gcc" "aarch64-unknown-linux-gnu-gcc" \ - --replace-fail "aarch64-linux-gnu-g++" "aarch64-unknown-linux-gnu-g++" \ - --replace-fail "arm-linux-gnueabihf-as" "armv7l-unknown-linux-gnueabihf-as" \ - --replace-fail "arm-linux-gnueabihf-gcc" "armv7l-unknown-linux-gnueabihf-gcc" \ - --replace-fail "arm-linux-gnueabihf-g++" "armv7l-unknown-linux-gnueabihf-g++" + --replace-fail "\''${CMAKE_SYSTEM_PROCESSOR}-linux-gnu" "\''${CMAKE_SYSTEM_PROCESSOR}-unknown-linux-gnu" \ + --replace-fail "arm-linux-gnueabihf" "armv7l-unknown-linux-gnueabihf" # If we don’t turn this off, then you won’t be able to run binaries that # are installed by vcpkg. find triplets -name '*linux*.cmake' -exec bash -c 'echo "set(X_VCPKG_RPATH_KEEP_SYSTEM_PATHS ON)" >> "$1"' -- {} \;