Unverified Commit 545fd21e authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

flet-client-flutter 0.25.2 -> 0.26.0, better update script (#380392)

parents 52bdf614 b7ab2d9e
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
{
  "flet_ads": "sha256-uvfhwfuhw0by5CN9Z9VAUKrH9s2S4ltOf/93PDdGGKM=",
  "flet_audio": "sha256-3xr0pYUylBNvswNvRath10A/EuCr4mTrTFjvlUAVgJQ=",
  "flet_audio_recorder": "sha256-gOgd+6XZ0KJUG7bvxqyr5IjsNL/dy9RsJ0wbtMVr3bM=",
  "flet_flashlight": "sha256-a/WnJdrSjM0FrYm/HghbocyGTMpT2xfa90z/Zv+Bp1Y=",
  "flet_geolocator": "sha256-ZXt9rYWHr27FBzlQT1uxg5/l2E7JX1tDI3WgChx9DAs=",
  "flet_lottie": "sha256-tpoMiI+rpD5HSqIsDvo0QNkwN4nifG3rJkUlVSHWNzM=",
  "flet_map": "sha256-k42GK37MGdMI/QM04GuF0LQ6AAaL7mrZ6z9IGObYhYM=",
  "flet_permission_handler": "sha256-Lj0bHcERjdfgUAbvPW7z58fAWT/BfKEJkBhNUrNVG9o=",
  "flet_rive": "sha256-X8MRlnktjd5v0dfi9wvPvgl8lTgexfocgf5/ja7UpWk=",
  "flet_video": "sha256-IfUkld4TZgtkIL1l1vmWFoCAzgVOEtALosmvkBZVq1M=",
  "flet_webview": "sha256-wvypCJx5OuNYWcJMiW3L05PQI9ZY1tONebujI+EJu4E="
}
+13 −15
Original line number Diff line number Diff line
{ lib
, fetchFromGitHub
, pkg-config
, flutter324
, flutter327
, gst_all_1
, libunwind
, makeWrapper
, mimalloc
, orc
, yq
, runCommand
, python3
, nix
, gitUpdater
, nix-prefetch-git
, mpv-unwrapped
, libplacebo
, _experimental-update-script-combinators
, flet-client-flutter
, fletTarget ? "linux"
}:

flutter324.buildFlutterApplication rec {
flutter327.buildFlutterApplication rec {
  pname = "flet-client-flutter";
  version = "0.25.2";
  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "flet-dev";
    repo = "flet";
    tag = "v${version}";
    hash = "sha256-bD44MCRZPXB/xuw2vBCzNbRNSVgdc4GyyWg3F2adxKk=";
    hash = "sha256-KmZ13QiZeZ6jljs2wibetbACfNODGJ47II8XcRAxoX4=";
  };

  sourceRoot = "${src.name}/client";

  gitHashes = lib.importJSON ./git_hashes.json;

  cmakeFlags = [
    "-DMIMALLOC_LIB=${mimalloc}/lib/mimalloc.o"
  ];
@@ -59,16 +61,12 @@ flutter324.buildFlutterApplication rec {
  ;

  passthru = {
    pubspecSource = runCommand "pubspec.lock.json" {
        buildInputs = [ yq ];
        inherit (flet-client-flutter) src;
      } ''
      cat $src/client/pubspec.lock | yq > $out
    '';

    updateScript = _experimental-update-script-combinators.sequence [
      (gitUpdater { rev-prefix = "v"; })
      (_experimental-update-script-combinators.copyAttrOutputToFile "flet-client-flutter.pubspecSource" ./pubspec.lock.json)
      {
        command = ["env" "PATH=${lib.makeBinPath [(python3.withPackages (p: [p.pyyaml])) nix-prefetch-git nix]}" "python3" ./update-lockfiles.py ];
        supportedFeatures = ["silent"];
      }
    ];
  };

+119 −67
Original line number Diff line number Diff line
@@ -154,11 +154,11 @@
      "dependency": "transitive",
      "description": {
        "name": "collection",
        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "1.18.0"
      "version": "1.19.0"
    },
    "cross_file": {
      "dependency": "transitive",
@@ -210,6 +210,26 @@
      "source": "hosted",
      "version": "0.7.10"
    },
    "device_info_plus": {
      "dependency": "transitive",
      "description": {
        "name": "device_info_plus",
        "sha256": "b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "11.2.1"
    },
    "device_info_plus_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "device_info_plus_platform_interface",
        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "7.0.2"
    },
    "dio": {
      "dependency": "transitive",
      "description": {
@@ -301,112 +321,134 @@
      "version": "0.69.0"
    },
    "flet": {
      "dependency": "direct main",
      "dependency": "direct overridden",
      "description": {
        "path": "../packages/flet",
        "relative": true
      },
      "source": "path",
      "version": "0.25.1"
      "version": "0.26.0"
    },
    "flet_ads": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_ads",
        "relative": true
        "path": "src/flutter/flet_ads",
        "ref": "0.1.0",
        "resolved-ref": "01e7065fcbebb1317b3f16951e6cf0c5fcff658b",
        "url": "https://github.com/flet-dev/flet-ads.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_audio": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_audio",
        "relative": true
        "path": "src/flutter/flet_audio",
        "ref": "0.1.0",
        "resolved-ref": "a146bf580a211c6d1f5c45070d15532ea2e92af7",
        "url": "https://github.com/flet-dev/flet-audio.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_audio_recorder": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_audio_recorder",
        "relative": true
        "path": "src/flutter/flet_audio_recorder",
        "ref": "0.1.0",
        "resolved-ref": "eb186cd49fde3136f65d0d074bca5ca688260e53",
        "url": "https://github.com/flet-dev/flet-audio-recorder.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_flashlight": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_flashlight",
        "relative": true
        "path": "src/flutter/flet_flashlight",
        "ref": "0.1.0",
        "resolved-ref": "a12a12259eaac801ee99d465727ec4a9fe50121e",
        "url": "https://github.com/flet-dev/flet-flashlight.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_geolocator": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_geolocator",
        "relative": true
        "path": "src/flutter/flet_geolocator",
        "ref": "0.1.0",
        "resolved-ref": "7b17d7aab169a7488da90fd73b3acd8e568f4f03",
        "url": "https://github.com/flet-dev/flet-geolocator.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.25.2"
    },
    "flet_lottie": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_lottie",
        "relative": true
        "path": "src/flutter/flet_lottie",
        "ref": "0.1.0",
        "resolved-ref": "f28c767b5d43de650155a5a97e2d971fb833c9f8",
        "url": "https://github.com/flet-dev/flet-lottie.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_map": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_map",
        "relative": true
        "path": "src/flutter/flet_map",
        "ref": "0.1.0",
        "resolved-ref": "dfa3cf6776b0dc5f238227d5f378cda7be190eaf",
        "url": "https://github.com/flet-dev/flet-map.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_permission_handler": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_permission_handler",
        "relative": true
        "path": "src/flutter/flet_permission_handler",
        "ref": "0.1.0",
        "resolved-ref": "4ead86b6c7e54b914215b6087fcb17b7e921d75c",
        "url": "https://github.com/flet-dev/flet-permission-handler.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_rive": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_rive",
        "relative": true
        "path": "src/flutter/flet_rive",
        "ref": "0.1.0",
        "resolved-ref": "089f7ad923f747ad764aa2781eca9a36382bb912",
        "url": "https://github.com/flet-dev/flet-rive.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_video": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_video",
        "relative": true
        "path": "src/flutter/flet_video",
        "ref": "0.1.0",
        "resolved-ref": "76f3f76f04c7573e047204648378ee2f31db7a15",
        "url": "https://github.com/flet-dev/flet-video.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flet_webview": {
      "dependency": "direct main",
      "description": {
        "path": "../packages/flet_webview",
        "relative": true
        "path": "src/flutter/flet_webview",
        "ref": "0.1.0",
        "resolved-ref": "b1cfb3155469bc0a9a7578afcd58e7f32669b164",
        "url": "https://github.com/flet-dev/flet-webview.git"
      },
      "source": "path",
      "version": "0.25.1"
      "source": "git",
      "version": "0.1.0"
    },
    "flutter": {
      "dependency": "direct main",
@@ -714,21 +756,21 @@
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker",
        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "10.0.5"
      "version": "10.0.7"
    },
    "leak_tracker_flutter_testing": {
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker_flutter_testing",
        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "3.0.5"
      "version": "3.0.8"
    },
    "leak_tracker_testing": {
      "dependency": "transitive",
@@ -1234,21 +1276,21 @@
      "dependency": "transitive",
      "description": {
        "name": "rive",
        "sha256": "b44b62feb908610ca6c85e05f4573a66118a23867425926cf06152d171236141",
        "sha256": "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "0.13.17"
      "version": "0.13.20"
    },
    "rive_common": {
      "dependency": "transitive",
      "description": {
        "name": "rive_common",
        "sha256": "a3e5786f8d85c89977062b9ceeb3b72a7c28f81e32fb68497744042ce20bee2f",
        "sha256": "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "0.4.12"
      "version": "0.4.15"
    },
    "safe_local_storage": {
      "dependency": "transitive",
@@ -1464,7 +1506,7 @@
      "dependency": "transitive",
      "description": "flutter",
      "source": "sdk",
      "version": "0.0.99"
      "version": "0.0.0"
    },
    "source_span": {
      "dependency": "transitive",
@@ -1490,11 +1532,11 @@
      "dependency": "transitive",
      "description": {
        "name": "stack_trace",
        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "1.11.1"
      "version": "1.12.0"
    },
    "stream_channel": {
      "dependency": "transitive",
@@ -1510,11 +1552,11 @@
      "dependency": "transitive",
      "description": {
        "name": "string_scanner",
        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "1.2.0"
      "version": "1.3.0"
    },
    "sync_http": {
      "dependency": "transitive",
@@ -1550,11 +1592,11 @@
      "dependency": "transitive",
      "description": {
        "name": "test_api",
        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "0.7.2"
      "version": "0.7.3"
    },
    "torch_light": {
      "dependency": "transitive",
@@ -1750,11 +1792,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "14.2.5"
      "version": "14.3.0"
    },
    "volume_controller": {
      "dependency": "transitive",
@@ -1810,11 +1852,11 @@
      "dependency": "transitive",
      "description": {
        "name": "webdriver",
        "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e",
        "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "3.0.3"
      "version": "3.0.4"
    },
    "webview_flutter": {
      "dependency": "transitive",
@@ -1876,6 +1918,16 @@
      "source": "hosted",
      "version": "5.5.3"
    },
    "win32_registry": {
      "dependency": "transitive",
      "description": {
        "name": "win32_registry",
        "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
      "version": "1.1.4"
    },
    "window_manager": {
      "dependency": "transitive",
      "description": {
+42 −0
Original line number Diff line number Diff line
from argparse import ArgumentParser
from pathlib import Path
import json
import subprocess
import yaml

THIS_FOLDER = Path(__file__).parent
FLAKE_DIR = THIS_FOLDER
while True:
    assert str(FLAKE_DIR) != '/'
    if (FLAKE_DIR / "flake.nix").exists():
        break
    FLAKE_DIR = FLAKE_DIR.parent

source = Path(subprocess.run(['nix-build', FLAKE_DIR, '-A', 'flet-client-flutter.src', '--no-out-link'], stdout=subprocess.PIPE).stdout.decode('utf-8').strip())
assert source.is_absolute()

source_pubspec_lock = source / "client" / "pubspec.lock"

output_pubspec = THIS_FOLDER / "pubspec.lock.json"
output_git_hashes = THIS_FOLDER / "git_hashes.json"

data = yaml.safe_load(source_pubspec_lock.open('r'))
output_pubspec.write_text(json.dumps(data, indent=2) + "\n")

output_data = {}

def hash_git(package):
    print(package)
    resolved_ref = package['resolved-ref']
    url = package['url']
    full_output = subprocess.run(['nix-prefetch-git', '--url', url, '--rev', resolved_ref], stdout=subprocess.PIPE).stdout.decode('utf-8')
    json_output = json.loads(full_output)
    return json_output['hash']

for name, package in data['packages'].items():
    if package['source'] != 'git':
        continue
    hash = hash_git(package['description'])
    output_data[name] = hash

output_git_hashes.write_text(json.dumps(output_data, indent=2) + "\n")