talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

vcpkg: 2024.12.16 -> 2025.01.13 (#381254)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2025-02-17 02:43:39 +01:00 committed by GitHub
commit 38c804df4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/by-name/vc/vcpkg-tool/package.nix
View File

@ -24,13 +24,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "vcpkg-tool"; pname = "vcpkg-tool";
version = "2024-07-10"; version = "2025-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "vcpkg-tool"; repo = "vcpkg-tool";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-P/ARKMfZdrfO+24rBrRm9k8tkBPSJJBqH509+iarNkw="; hash = "sha256-eCeq7HKjK0aTsPqFP8jP6gIrzcF6YBEJG1MdbQse42Y=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -178,6 +178,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = { passthru.tests = {
testWrapper = runCommand "vcpkg-tool-test-wrapper" { buildInputs = [ finalAttrs.finalPackage ]; } '' testWrapper = runCommand "vcpkg-tool-test-wrapper" { buildInputs = [ finalAttrs.finalPackage ]; } ''
export NIX_VCPKG_DEBUG_PRINT_ENVVARS=true export NIX_VCPKG_DEBUG_PRINT_ENVVARS=true
export VCPKG_ROOT=.
vcpkg --x-packages-root="test" --x-install-root="test2" contact > "$out" vcpkg --x-packages-root="test" --x-install-root="test2" contact > "$out"
cat "$out" | head -n 4 | diff - ${writeText "vcpkg-tool-test-wrapper-expected" '' cat "$out" | head -n 4 | diff - ${writeText "vcpkg-tool-test-wrapper-expected" ''

4
pkgs/by-name/vc/vcpkg/package.nix
View File

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vcpkg"; pname = "vcpkg";
version = "2024.12.16"; version = "2025.01.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "vcpkg"; repo = "vcpkg";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-4Xk71JPklq7qwYXPE+EzNvD5rTfPvgyV/O7nSvgjKVo="; hash = "sha256-T4ihf3PC53Ch33E/MF5VR3DWKHty4PryInnkiQdHdGM=";
leaveDotGit = true; leaveDotGit = true;
postFetch = '' postFetch = ''
cd "$out" cd "$out"

2
pkgs/top-level/all-packages.nix
View File

@ -355,7 +355,7 @@ with pkgs;
}; };
vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix {
fmt = fmt_10; fmt = fmt_11;
}; };
r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; r3ctl = qt5.callPackage ../tools/misc/r3ctl { };