From 2f705bc10e677b53e2f7bcd4a428a68f7a871395 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 11 Feb 2025 14:00:10 -0500 Subject: [PATCH 1/3] vcpkg-tool: 2024-07-10 -> 2025-01-29 --- pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index d67d50871d11..a5204fbbf2fd 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 = "2024-07-10"; + version = "2025-01-29"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-P/ARKMfZdrfO+24rBrRm9k8tkBPSJJBqH509+iarNkw="; + hash = "sha256-eCeq7HKjK0aTsPqFP8jP6gIrzcF6YBEJG1MdbQse42Y="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd5e4cf7f83..e64fcd868850 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -357,7 +357,7 @@ with pkgs; }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - fmt = fmt_10; + fmt = fmt_11; }; r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; From df3ffb239df3783eb69423bd2eacc4babf8f9a54 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 11 Feb 2025 14:00:32 -0500 Subject: [PATCH 2/3] vcpkg: 2024.12.16 -> 2025.01.13 --- pkgs/by-name/vc/vcpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 14bc32e5cc2c..41116767cbcb 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 = "2024.12.16"; + version = "2025.01.13"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-4Xk71JPklq7qwYXPE+EzNvD5rTfPvgyV/O7nSvgjKVo="; + hash = "sha256-T4ihf3PC53Ch33E/MF5VR3DWKHty4PryInnkiQdHdGM="; leaveDotGit = true; postFetch = '' cd "$out" From ff6fa7faae5b9b8198fc598e3a76e49c8f008504 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 11 Feb 2025 16:56:37 -0500 Subject: [PATCH 3/3] vcpkg-tool: set VCPKG_ROOT in testWrapper --- pkgs/by-name/vc/vcpkg-tool/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index a5204fbbf2fd..5dc50afcfce6 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -178,6 +178,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { testWrapper = runCommand "vcpkg-tool-test-wrapper" { buildInputs = [ finalAttrs.finalPackage ]; } '' export NIX_VCPKG_DEBUG_PRINT_ENVVARS=true + export VCPKG_ROOT=. vcpkg --x-packages-root="test" --x-install-root="test2" contact > "$out" cat "$out" | head -n 4 | diff - ${writeText "vcpkg-tool-test-wrapper-expected" ''