flutter332: 3.32.6 -> 3.32.7 (#426532)

pkgs/development/compilers/flutter/update/update.py

···
 #! /usr/bin/env nix-shell
 #! nix-shell -i python3 -p python3Packages.pyyaml
 
-import shutil
+import argparse
 import json
-import urllib.request
-import tempfile
-from sys import exit
 import os
-import subprocess
 import re
-import json
-import argparse
+import subprocess
+import sys
+import tempfile
+import urllib.request
+from pathlib import Path
+
 import yaml
-import json
 
-FAKE_HASH = 'sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='
+FAKE_HASH = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
 
-NIXPKGS_ROOT = subprocess.Popen(['git',
-                                 'rev-parse',
-                                 '--show-toplevel'],
-                                stdout=subprocess.PIPE,
-                                text=True).communicate()[0].strip()
+NIXPKGS_ROOT = (
+    subprocess.Popen(
+        ["git", "rev-parse", "--show-toplevel"], stdout=subprocess.PIPE, text=True
+    )
+    .communicate()[0]
+    .strip()
+)
 
 
 def load_code(name, **kwargs):
-    with open(f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/update/{name}.in", 'r') as f:
+    with Path(
+        f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/update/{name}.in"
+    ).open("r", encoding="utf-8") as f:
         code = f.read()
 
-    for (key, value) in kwargs.items():
+    for key, value in kwargs.items():
         code = code.replace(f"@{key}@", value)
 
     return code
···
 
 # Return out paths
 def nix_build(code):
-    temp = tempfile.NamedTemporaryFile(mode='w')
-    temp.write(code)
-    temp.flush()
-    os.fsync(temp.fileno())
+    with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", delete=False) as temp:
+        temp.write(code)
+        temp.flush()
+        os.fsync(temp.fileno())
+    temp_name = temp.name
 
     process = subprocess.Popen(
         [
···
             "--impure",
             "--no-out-link",
             "--expr",
-            f"with import {NIXPKGS_ROOT} {{}}; callPackage {temp.name} {{}}"],
+            f"with import {NIXPKGS_ROOT} {{}}; callPackage {temp_name} {{}}",
+        ],
         stdout=subprocess.PIPE,
-        text=True)
+        text=True,
+    )
 
     process.wait()
-    temp.close()
+    Path(temp_name).unlink()  # Clean up the temporary file
     return process.stdout.read().strip().splitlines()[0]
 
 
 # Return errors
 def nix_build_to_fail(code):
-    temp = tempfile.NamedTemporaryFile(mode='w')
-    temp.write(code)
-    temp.flush()
-    os.fsync(temp.fileno())
+    with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", delete=False) as temp:
+        temp.write(code)
+        temp.flush()
+        os.fsync(temp.fileno())
+    temp_name = temp.name
 
     process = subprocess.Popen(
         [
···
             "--keep-going",
             "--no-link",
             "--expr",
-            f"with import {NIXPKGS_ROOT} {{}}; callPackage {temp.name} {{}}"],
+            f"with import {NIXPKGS_ROOT} {{}}; callPackage {temp_name} {{}}",
+        ],
         stderr=subprocess.PIPE,
-        text=True)
+        text=True,
+    )
 
     stderr = ""
     while True:
···
         print(line.strip())
 
     process.wait()
-    temp.close()
+    Path(temp_name).unlink()  # Clean up the temporary file
     return stderr
 
 
 def get_engine_hashes(engine_version, flutter_version):
-    code = load_code("get-engine-hashes.nix",
-                     nixpkgs_root=NIXPKGS_ROOT,
-                     flutter_version=flutter_version,
-                     engine_version=engine_version)
+    code = load_code(
+        "get-engine-hashes.nix",
+        nixpkgs_root=NIXPKGS_ROOT,
+        flutter_version=flutter_version,
+        engine_version=engine_version,
+    )
 
     stderr = nix_build_to_fail(code)
 
     pattern = re.compile(
-        rf"/nix/store/.*-flutter-engine-source-{engine_version}-(.+?-.+?)-(.+?-.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n")
+        rf"/nix/store/.*-flutter-engine-source-{engine_version}-(.+?-.+?)-(.+?-.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n"
+    )
     matches = pattern.findall(stderr)
     result_dict = {}
 
···
 
     def sort_dict_recursive(d):
         return {
-            k: sort_dict_recursive(v) if isinstance(
-                v, dict) else v for k, v in sorted(
-                d.items())}
-    result_dict = sort_dict_recursive(result_dict)
+            k: sort_dict_recursive(v) if isinstance(v, dict) else v
+            for k, v in sorted(d.items())
+        }
 
-    return result_dict
+    return sort_dict_recursive(result_dict)
 
 
 def get_artifact_hashes(flutter_compact_version):
-    code = load_code("get-artifact-hashes.nix",
-                     nixpkgs_root=NIXPKGS_ROOT,
-                     flutter_compact_version=flutter_compact_version)
+    code = load_code(
+        "get-artifact-hashes.nix",
+        nixpkgs_root=NIXPKGS_ROOT,
+        flutter_compact_version=flutter_compact_version,
+    )
 
     stderr = nix_build_to_fail(code)
 
     pattern = re.compile(
-        r"/nix/store/.*-flutter-artifacts-(.+?)-(.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n")
+        r"/nix/store/.*-flutter-artifacts-(.+?)-(.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n"
+    )
     matches = pattern.findall(stderr)
     result_dict = {}
 
···
 
     def sort_dict_recursive(d):
         return {
-            k: sort_dict_recursive(v) if isinstance(
-                v, dict) else v for k, v in sorted(
-                d.items())}
-    result_dict = sort_dict_recursive(result_dict)
+            k: sort_dict_recursive(v) if isinstance(v, dict) else v
+            for k, v in sorted(d.items())
+        }
 
-    return result_dict
+    return sort_dict_recursive(result_dict)
 
 
 def get_dart_hashes(dart_version, channel):
-    platforms = [
-        "x86_64-linux",
-        "aarch64-linux",
-        "x86_64-darwin",
-        "aarch64-darwin"]
+    platforms = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"]
     result_dict = {}
     for platform in platforms:
         code = load_code(
             "get-dart-hashes.nix",
             dart_version=dart_version,
             channel=channel,
-            platform=platform)
+            platform=platform,
+        )
         stderr = nix_build_to_fail(code)
 
         pattern = re.compile(r"got:\s+(.+?)\n")
···
 
 
 def get_flutter_hash_and_src(flutter_version):
-    code = load_code(
-        "get-flutter.nix",
-        flutter_version=flutter_version,
-        hash="")
+    code = load_code("get-flutter.nix", flutter_version=flutter_version, hash="")
 
     stderr = nix_build_to_fail(code)
     pattern = re.compile(r"got:\s+(.+?)\n")
-    hash = pattern.findall(stderr)[0]
+    flutter_hash_value = pattern.findall(stderr)[0]
 
     code = load_code(
-        "get-flutter.nix",
-        flutter_version=flutter_version,
-        hash=hash)
+        "get-flutter.nix", flutter_version=flutter_version, hash=flutter_hash_value
+    )
 
-    return (hash, nix_build(code))
+    return (flutter_hash_value, nix_build(code))
 
 
 def get_pubspec_lock(flutter_compact_version, flutter_src):
···
         "get-pubspec-lock.nix",
         flutter_compact_version=flutter_compact_version,
         flutter_src=flutter_src,
-        hash="")
+        hash="",
+    )
 
     stderr = nix_build_to_fail(code)
     pattern = re.compile(r"got:\s+(.+?)\n")
-    hash = pattern.findall(stderr)[0]
+    pubspec_lock_hash = pattern.findall(stderr)[0]
 
     code = load_code(
         "get-pubspec-lock.nix",
         flutter_compact_version=flutter_compact_version,
         flutter_src=flutter_src,
-        hash=hash)
+        hash=pubspec_lock_hash,
+    )
 
     pubspec_lock_file = nix_build(code)
 
-    with open(pubspec_lock_file, 'r') as f:
+    with Path(pubspec_lock_file).open("r", encoding="utf-8") as f:
         pubspec_lock_yaml = f.read()
 
     return yaml.safe_load(pubspec_lock_yaml)
 
+
 def get_engine_swiftshader_rev(engine_version):
-    with urllib.request.urlopen(f"https://github.com/flutter/flutter/raw/{engine_version}/DEPS") as f:
-        deps = f.read().decode('utf-8')
-        pattern = re.compile(r"Var\('swiftshader_git'\) \+ '\/SwiftShader\.git' \+ '@' \+ \'([0-9a-fA-F]{40})\'\,")
-        rev = pattern.findall(deps)[0]
-        return rev
+    with urllib.request.urlopen(
+        f"https://github.com/flutter/flutter/raw/{engine_version}/DEPS"
+    ) as f:
+        deps = f.read().decode("utf-8")
+        pattern = re.compile(
+            r"Var\('swiftshader_git'\) \+ '\/SwiftShader\.git' \+ '@' \+ \'([0-9a-fA-F]{40})\'\,"
+        )
+        return pattern.findall(deps)[0]
+
 
 def get_engine_swiftshader_hash(engine_swiftshader_rev):
     code = load_code(
         "get-engine-swiftshader.nix",
         engine_swiftshader_rev=engine_swiftshader_rev,
-        hash="")
+        hash="",
+    )
 
     stderr = nix_build_to_fail(code)
     pattern = re.compile(r"got:\s+(.+?)\n")
     return pattern.findall(stderr)[0]
 
+
 def write_data(
-        nixpkgs_flutter_version_directory,
-        flutter_version,
-        channel,
-        engine_hash,
-        engine_hashes,
-        engine_swiftshader_hash,
-        engine_swiftshader_rev,
-        dart_version,
-        dart_hash,
-        flutter_hash,
-        artifact_hashes,
-        pubspec_lock):
-    with open(f"{nixpkgs_flutter_version_directory}/data.json", "w") as f:
-        f.write(json.dumps({
-            "version": flutter_version,
-            "engineVersion": engine_hash,
-            "engineSwiftShaderHash": engine_swiftshader_hash,
-            "engineSwiftShaderRev": engine_swiftshader_rev,
-            "channel": channel,
-            "engineHashes": engine_hashes,
-            "dartVersion": dart_version,
-            "dartHash": dart_hash,
-            "flutterHash": flutter_hash,
-            "artifactHashes": artifact_hashes,
-            "pubspecLock": pubspec_lock,
-        }, indent=2).strip() + "\n")
+    nixpkgs_flutter_version_directory,
+    flutter_version,
+    channel,
+    engine_hash,
+    engine_hashes,
+    engine_swiftshader_hash,
+    engine_swiftshader_rev,
+    dart_version,
+    dart_hash,
+    flutter_hash,
+    artifact_hashes,
+    pubspec_lock,
+):
+    with Path(f"{nixpkgs_flutter_version_directory}/data.json").open(
+        "w", encoding="utf-8"
+    ) as f:
+        f.write(
+            json.dumps(
+                {
+                    "version": flutter_version,
+                    "engineVersion": engine_hash,
+                    "engineSwiftShaderHash": engine_swiftshader_hash,
+                    "engineSwiftShaderRev": engine_swiftshader_rev,
+                    "channel": channel,
+                    "engineHashes": engine_hashes,
+                    "dartVersion": dart_version,
+                    "dartHash": dart_hash,
+                    "flutterHash": flutter_hash,
+                    "artifactHashes": artifact_hashes,
+                    "pubspecLock": pubspec_lock,
+                },
+                indent=2,
+            ).strip()
+            + "\n"
+        )
 
 
 def update_all_packages():
     versions_directory = f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/versions"
-    versions = [directory for directory in os.listdir(versions_directory)]
-    versions = sorted(versions, key=lambda x: (
-        int(x.split('_')[0]), int(x.split('_')[1])), reverse=True)
+    versions = [d.name for d in Path(versions_directory).iterdir()]
+    versions = sorted(
+        versions,
+        key=lambda x: (int(x.split("_")[0]), int(x.split("_")[1])),
+        reverse=True,
+    )
 
     new_content = [
         "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });",
-        "flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });",
+        "flutterPackages-source = recurseIntoAttrs (",
+        "  callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }",
+        ");",
         "flutterPackages = flutterPackages-bin;",
         "flutter = flutterPackages.stable;",
-    ] + [f"flutter{version.replace('_', '')} = flutterPackages.v{version};" for version in versions]
+    ] + [
+        f"flutter{version.replace('_', '')} = flutterPackages.v{version};"
+        for version in versions
+    ]
 
-    with open(f"{NIXPKGS_ROOT}/pkgs/top-level/all-packages.nix", 'r') as file:
+    with Path(f"{NIXPKGS_ROOT}/pkgs/top-level/all-packages.nix").open(
+        "r", encoding="utf-8"
+    ) as file:
         lines = file.read().splitlines(keepends=True)
 
     start = -1
     end = -1
     for i, line in enumerate(lines):
-        if "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });" in line:
+        if (
+            "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });"
+            in line
+        ):
             start = i
         if start != -1 and len(line.strip()) == 0:
             end = i
···
 
     if start != -1 and end != -1:
         del lines[start:end]
-        lines[start:start] = [f"  {l}\n" for l in new_content]
+        lines[start:start] = [f"  {line}\n" for line in new_content]
 
-    with open(f"{NIXPKGS_ROOT}/pkgs/top-level/all-packages.nix", 'w') as file:
+    with Path(f"{NIXPKGS_ROOT}/pkgs/top-level/all-packages.nix").open(
+        "w", encoding="utf-8"
+    ) as file:
         file.write("".join(lines))
 
 
···
     engine_hash = None
     dart_version = None
 
-    releases = json.load(urllib.request.urlopen(
-        "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json"))
+    releases = json.load(
+        urllib.request.urlopen(
+            "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json"
+        )
+    )
 
     if not channel:
-        channel = 'stable'
+        channel = "stable"
 
     if not flutter_version:
-        hash = releases['current_release'][channel]
+        release_hash = releases["current_release"][channel]
         release = next(
             filter(
-                lambda release: release['hash'] == hash,
-                releases['releases']))
-        flutter_version = release['version']
+                lambda release: release["hash"] == release_hash, releases["releases"]
+            )
+        )
+        flutter_version = release["version"]
 
-    tags = subprocess.Popen(['git',
-                             'ls-remote',
-                             '--tags',
-                             'https://github.com/flutter/flutter.git'],
-                            stdout=subprocess.PIPE,
-                            text=True).communicate()[0].strip()
+    tags = (
+        subprocess.Popen(
+            ["git", "ls-remote", "--tags", "https://github.com/flutter/flutter.git"],
+            stdout=subprocess.PIPE,
+            text=True,
+        )
+        .communicate()[0]
+        .strip()
+    )
 
     try:
-        flutter_hash = next(
-            filter(
-                lambda line: line.endswith(f'refs/tags/{flutter_version}'),
-                tags.splitlines())).split('refs')[0].strip()
+        flutter_hash = (
+            next(
+                filter(
+                    lambda line: line.endswith(f"refs/tags/{flutter_version}"),
+                    tags.splitlines(),
+                )
+            )
+            .split("refs")[0]
+            .strip()
+        )
 
-        engine_hash = urllib.request.urlopen(f'https://github.com/flutter/flutter/raw/{flutter_hash}/bin/internal/engine.version').read().decode('utf-8').strip()
+        engine_hash = (
+            urllib.request.urlopen(
+                f"https://github.com/flutter/flutter/raw/{flutter_hash}/bin/internal/engine.version"
+            )
+            .read()
+            .decode("utf-8")
+            .strip()
+        )
     except StopIteration:
-        exit(
-            f"Couldn't find Engine hash for Flutter version: {flutter_version}")
+        sys.exit(f"Couldn't find Engine hash for Flutter version: {flutter_version}")
 
     try:
         dart_version = next(
             filter(
-                lambda release: release['version'] == flutter_version,
-                releases['releases']))['dart_sdk_version']
+                lambda release: release["version"] == flutter_version,
+                releases["releases"],
+            )
+        )["dart_sdk_version"]
 
         if " " in dart_version:
-            dart_version = dart_version.split(' ')[2][:-1]
+            dart_version = dart_version.split(" ")[2][:-1]
     except StopIteration:
-        exit(
-            f"Couldn't find Dart version for Flutter version: {flutter_version}")
+        sys.exit(f"Couldn't find Dart version for Flutter version: {flutter_version}")
 
     return (flutter_version, engine_hash, dart_version, channel)
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Update Flutter in Nixpkgs')
-    parser.add_argument('--version', type=str, help='Specify Flutter version')
-    parser.add_argument('--channel', type=str, help='Specify Flutter release channel')
-    parser.add_argument('--artifact-hashes', action='store_true',
-                        help='Whether to get artifact hashes')
+    parser = argparse.ArgumentParser(description="Update Flutter in Nixpkgs")
+    parser.add_argument("--version", type=str, help="Specify Flutter version")
+    parser.add_argument("--channel", type=str, help="Specify Flutter release channel")
+    parser.add_argument(
+        "--artifact-hashes", action="store_true", help="Whether to get artifact hashes"
+    )
     args = parser.parse_args()
 
-    (flutter_version, engine_hash, dart_version, channel) = find_versions(args.version, args.channel)
+    (flutter_version, engine_hash, dart_version, channel) = find_versions(
+        args.version, args.channel
+    )
 
-    flutter_compact_version = '_'.join(flutter_version.split('.')[:2])
+    flutter_compact_version = "_".join(flutter_version.split(".")[:2])
 
     if args.artifact_hashes:
         print(
-            json.dumps(
-                get_artifact_hashes(flutter_compact_version),
-                indent=2).strip() +
-            "\n")
+            json.dumps(get_artifact_hashes(flutter_compact_version), indent=2).strip()
+            + "\n"
+        )
         return
 
-    print(f"Flutter version: {flutter_version} ({flutter_compact_version}) on ({channel})")
+    print(
+        f"Flutter version: {flutter_version} ({flutter_compact_version}) on ({channel})"
+    )
     print(f"Engine hash: {engine_hash}")
     print(f"Dart version: {dart_version}")
 
···
 
     nixpkgs_flutter_version_directory = f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/versions/{flutter_compact_version}"
 
-    if os.path.exists(f"{nixpkgs_flutter_version_directory}/data.json"):
-        os.remove(f"{nixpkgs_flutter_version_directory}/data.json")
-    os.makedirs(nixpkgs_flutter_version_directory, exist_ok=True)
+    if Path(f"{nixpkgs_flutter_version_directory}/data.json").exists():
+        Path(f"{nixpkgs_flutter_version_directory}/data.json").unlink()
+    Path(nixpkgs_flutter_version_directory).mkdir(parents=True, exist_ok=True)
 
     update_all_packages()
 
···
         artifact_hashes={},
         engine_hashes={},
         engine_swiftshader_hash=FAKE_HASH,
-        engine_swiftshader_rev='0',
-        **common_data_args)
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
 
     pubspec_lock = get_pubspec_lock(flutter_compact_version, flutter_src)
 
···
         artifact_hashes={},
         engine_hashes={},
         engine_swiftshader_hash=FAKE_HASH,
-        engine_swiftshader_rev='0',
-        **common_data_args)
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
 
     artifact_hashes = get_artifact_hashes(flutter_compact_version)
 
···
         artifact_hashes=artifact_hashes,
         engine_hashes={},
         engine_swiftshader_hash=FAKE_HASH,
-        engine_swiftshader_rev='0',
-        **common_data_args)
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
 
     engine_hashes = get_engine_hashes(engine_hash, flutter_version)
 
···
         artifact_hashes=artifact_hashes,
         engine_hashes=engine_hashes,
         engine_swiftshader_hash=FAKE_HASH,
-        engine_swiftshader_rev='0',
-        **common_data_args)
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
 
     engine_swiftshader_rev = get_engine_swiftshader_rev(engine_hash)
     engine_swiftshader_hash = get_engine_swiftshader_hash(engine_swiftshader_rev)
···
         engine_hashes=engine_hashes,
         engine_swiftshader_hash=engine_swiftshader_hash,
         engine_swiftshader_rev=engine_swiftshader_rev,
-        **common_data_args)
+        **common_data_args,
+    )
 
 
 if __name__ == "__main__":

pkgs/development/compilers/flutter/versions/3_32/data.json

···
 {
-  "version": "3.32.6",
-  "engineVersion": "72f2b18bb094f92f62a3113a8075240ebb59affa",
+  "version": "3.32.7",
+  "engineVersion": "39d6d6e699e51b2874210e14cddf1a22fb9524b2",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-MjWz+aveIDXygAejZiNGFZluR0gjpS62h16UcFGz7FA=",
-      "x86_64-linux": "sha256-MjWz+aveIDXygAejZiNGFZluR0gjpS62h16UcFGz7FA="
+      "aarch64-linux": "sha256-3cqYwwQlnHPMRoeRLsru+Xk9rMiAaLZ6rBxdJttJSW0=",
+      "x86_64-linux": "sha256-3cqYwwQlnHPMRoeRLsru+Xk9rMiAaLZ6rBxdJttJSW0="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-jWM+egf2tZVR8bnBXSHiXOG0CbkEjxEqxwPnaR7tJKk=",
-      "x86_64-linux": "sha256-jWM+egf2tZVR8bnBXSHiXOG0CbkEjxEqxwPnaR7tJKk="
+      "aarch64-linux": "sha256-8jXbz7gQZhaoU2Cs6uAbR5xF22HzBxMghA4edm/7oa4=",
+      "x86_64-linux": "sha256-8jXbz7gQZhaoU2Cs6uAbR5xF22HzBxMghA4edm/7oa4="
     }
   },
   "dartVersion": "3.8.1",
···
     "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=",
     "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c="
   },
-  "flutterHash": "sha256-YxApWMp6Ax1ZNOH/7kgeXgiaBcXN7Ves4TFUImFtd3s=",
+  "flutterHash": "sha256-fPCa9JHvQGP47uo6LHbGC2aMMwdX+AOEZfvIyZ3M2/U=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-thfXrVn6nWlQg23yDHiNAx6XebQkV80tkckONwmfjaU=",
-      "aarch64-linux": "sha256-fM90NqMpD4SkrjZfDXvHjMNdGiaDqX2T+A4cNNZkplk=",
-      "x86_64-darwin": "sha256-thfXrVn6nWlQg23yDHiNAx6XebQkV80tkckONwmfjaU=",
-      "x86_64-linux": "sha256-fM90NqMpD4SkrjZfDXvHjMNdGiaDqX2T+A4cNNZkplk="
+      "aarch64-darwin": "sha256-Gs4SLCLh/6e/n8lu6pTujksW/MqIieWymF151N5dDnw=",
+      "aarch64-linux": "sha256-aTVHfbG6V4T2/SDbxdCEYo3+7EryjK6sAUL4FF4AmUM=",
+      "x86_64-darwin": "sha256-Gs4SLCLh/6e/n8lu6pTujksW/MqIieWymF151N5dDnw=",
+      "x86_64-linux": "sha256-aTVHfbG6V4T2/SDbxdCEYo3+7EryjK6sAUL4FF4AmUM="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=",
-      "aarch64-linux": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=",
-      "x86_64-darwin": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg=",
-      "x86_64-linux": "sha256-Lh6z51v14kZIGxriaKDdOn5fAKyANm8FAzIozoOiAZg="
+      "aarch64-darwin": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=",
+      "aarch64-linux": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=",
+      "x86_64-darwin": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc=",
+      "x86_64-linux": "sha256-cKUp9CQq10Ls3dOcB3wPdnnwVK26RG0JWn0n4TsWigc="
     },
     "ios": {
-      "aarch64-darwin": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=",
-      "aarch64-linux": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=",
-      "x86_64-darwin": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g=",
-      "x86_64-linux": "sha256-zCR8wt7QZHl9UFOhkU8KFkyRbaUitXJHTiMLOe+M5/g="
+      "aarch64-darwin": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=",
+      "aarch64-linux": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=",
+      "x86_64-darwin": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ=",
+      "x86_64-linux": "sha256-EvzvRyR2aRomFPiz7WfGyhg0JiOHzCIi6xEDbLeIGAQ="
     },
     "linux": {
-      "aarch64-darwin": "sha256-dSXB6GFQZjHoyiDStAnohYtzFIrVWmD3DfQ0b+cGwcU=",
-      "aarch64-linux": "sha256-dSXB6GFQZjHoyiDStAnohYtzFIrVWmD3DfQ0b+cGwcU=",
-      "x86_64-darwin": "sha256-9ds2C7XBIvnzbgwcBPwJhaF/l/t+uZQEiuwQg2WIVkE=",
-      "x86_64-linux": "sha256-9ds2C7XBIvnzbgwcBPwJhaF/l/t+uZQEiuwQg2WIVkE="
+      "aarch64-darwin": "sha256-eLGFwZxd4P9NSnHhOssAvjWea+ahuPUtIi4BrsOxZDE=",
+      "aarch64-linux": "sha256-eLGFwZxd4P9NSnHhOssAvjWea+ahuPUtIi4BrsOxZDE=",
+      "x86_64-darwin": "sha256-WhDM+gxvSWsQ0RyaInKH3obabboMfBtfBPZPx6379kc=",
+      "x86_64-linux": "sha256-WhDM+gxvSWsQ0RyaInKH3obabboMfBtfBPZPx6379kc="
     },
     "macos": {
-      "aarch64-darwin": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=",
-      "aarch64-linux": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=",
-      "x86_64-darwin": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg=",
-      "x86_64-linux": "sha256-Qybdtwy8MfPEsCJUHxlV62fZyEAClOHM4thsEw4nmvg="
+      "aarch64-darwin": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=",
+      "aarch64-linux": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=",
+      "x86_64-darwin": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck=",
+      "x86_64-linux": "sha256-3QXe7KTjh9noCdZnCRbo6bXuif7dhQ75mk6/lyydSck="
     },
     "universal": {
-      "aarch64-darwin": "sha256-37CxKej4SB4Qm3aJVkf3SK0uiimLYSGJBAOwqWStmEY=",
-      "aarch64-linux": "sha256-7p4CTx///0ND5xUpb9uGbBgaLeClt/aGoSm6mE56ySk=",
-      "x86_64-darwin": "sha256-sjrzv4jJ28RViNaC7jG4utnerBj3521kXfT8CAgGOLI=",
-      "x86_64-linux": "sha256-B9gqS5lfLy8pYjP7N52jLqZmroukuAS/ed0xP5xspeg="
+      "aarch64-darwin": "sha256-Z7UTqCTESwcpv0yxzTEMThkQMNfisOCnhC7sltY0dUA=",
+      "aarch64-linux": "sha256-VIMu52o7BIEkxt4h0u4sILcrgKg85TY+3ieQl290icM=",
+      "x86_64-darwin": "sha256-/jOrwEy6EWCx8cS9MyIEI4NqO2H8Rs/VV7N6RmCyPWM=",
+      "x86_64-linux": "sha256-mcQYpXo8E/j4j4OYIwlcx6xpiyYbnKXrwfT+rl6W4Zw="
     },
     "web": {
-      "aarch64-darwin": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=",
-      "aarch64-linux": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=",
-      "x86_64-darwin": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU=",
-      "x86_64-linux": "sha256-iLAX0UCh+ZTsSggKj29cUm+8CIEJfXj+iWiTV1ndfrU="
+      "aarch64-darwin": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=",
+      "aarch64-linux": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=",
+      "x86_64-darwin": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8=",
+      "x86_64-linux": "sha256-2nnM91LPjdxuU2uWCdE2tFoZ75N0L5DWlJa75KCulY8="
     },
     "windows": {
-      "x86_64-darwin": "sha256-7M6lLznB1FwQi4e4O6r5IWRxYFaXhfdkSx3rN2GZr5c=",
-      "x86_64-linux": "sha256-7M6lLznB1FwQi4e4O6r5IWRxYFaXhfdkSx3rN2GZr5c="
+      "x86_64-darwin": "sha256-boajU3GH29bhgDT+emE3gIQjAtuon1OUi1gGBH6iq/4=",
+      "x86_64-linux": "sha256-boajU3GH29bhgDT+emE3gIQjAtuon1OUi1gGBH6iq/4="
     }
   },
   "pubspecLock": {