Unverified Commit 60de30e8 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

windows.sdk: 17.14.10+36327.8 -> 17.14.13+36414.22 (#434017)

parents 14473fa1 b60ce901

pkgs/os-specific/windows/msvcSdk/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  llvmPackages,

}:

let

  version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.productSemanticVersion;

  version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.buildVersion;



  hashes = (builtins.fromJSON (builtins.readFile ./hashes.json));
@@ -117,8 +117,8 @@ else 
        url = "https://www.visualstudio.com/license-terms/mt644918/";

      };

      platforms = lib.platforms.all;

      # The arm manifest is missing critical pieces.

      broken = stdenvNoCC.hostPlatform.isAarch;

      # The arm32 manifest is missing critical pieces.

      broken = stdenvNoCC.hostPlatform.isAarch32;

      sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

      teams = [ lib.teams.windows ];

    };

pkgs/os-specific/windows/msvcSdk/hashes.json

+3 −2
Original line number Diff line number Diff line 
{

  "x86_64": "sha256-s3iaz9SkV8H1j3rQ1ZWKe9I1o/42+buqxCnGAoA17j8=",

  "x86": "sha256-ZiFms3GWhTrEcE6/nf3pUjpdux5PRI3AtOzxofk93pk="

  "x86_64": "sha256-kp+xePTRZgqdAV3/BYhqKke3dXIkLWLM+IWFXtN2rHM=",

  "x86": "sha256-xEXV+XBNoXpAO8R/oDj8gfGb5tICr9ps4DN8Q4lqK2k=",

  "aarch64": "sha256-r0tTQUq3CePJ/7Vuzf4Zsy3Ebu0KiXNBwRHmrO3d15E="

}

pkgs/os-specific/windows/msvcSdk/manifest.json

+45 −44

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/os-specific/windows/msvcSdk/update.nu

+4 −3
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i nu -p nushell xwin

#!nix-shell -I nixpkgs=./.



use std/log

use std/dirs
@@ -19,19 +20,19 @@ def main [] { 
  let current_version = nix eval -f "" windows.sdk.version --json | from json



  let new_manifest = http get $MANIFEST_URL | decode | from json

  let new_version = $new_manifest.info.productSemanticVersion

  let new_version = $new_manifest.info.buildVersion



  if $current_version == $new_version {

      log info "Current Windows SDK manifest matches the newest version, exiting..."

      exit 0

  } else {

    log info $"Previous version (current_version)\nNew version (new_version)"

    log info $"Previous version ($current_version)\nNew version ($new_version)"

  }



  $new_manifest | to json | append "\n" | str join | save -f ($PATH | path join manifest.json)



  # TODO: Add arm once it isn't broken

  let hashes = ["x86_64", "x86"] | par-each {

  let hashes = ["x86_64", "x86", "aarch64"] | par-each {

    |arch|

    let dir = mktemp -d