Unverified Commit 38c804df authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

vcpkg: 2024.12.16 -> 2025.01.13 (#381254)

parents 0fa988b5 ff6fa7fa

pkgs/by-name/vc/vcpkg-tool/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -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 = [
@@ -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" ''

pkgs/by-name/vc/vcpkg/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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"

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,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 { };