vcpkg-tool: 2025-12-05 -> 2025-12-16
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
Reference in New Issue
Block a user