From 376d85631778d025c8c55e417a3626b2e89646ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 May 2023 04:36:53 +0000
Subject: [PATCH 01/43] lldpd: 1.0.16 -> 1.0.17

(cherry picked from commit 465abd47ea592fbe0507ae828acbde342c41b901)
---
 pkgs/tools/networking/lldpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 6107efff7871..d480b3e01c72 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lldpd";
-  version = "1.0.16";
+  version = "1.0.17";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
-    sha256 = "sha256-47ORZQx7pnzqL+hNZ/201/yKoexc+G64u5hHEd+EZak=";
+    sha256 = "sha256-k0MXfxRdK8pm7wPVlSgHnT8WY8YkseK50IJo79xhJ84=";
   };
 
   configureFlags = [

From 38ad2e048bddb5c1820e5b4167734c7572b6f86c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Aug 2023 13:37:52 +0000
Subject: [PATCH 02/43] freeswitch: 1.10.9 -> 1.10.10

(cherry picked from commit 0af1a3b6ced4db22e0cf86b46daa6241ee3f3ff5)
---
 pkgs/servers/sip/freeswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index d8a6882671e6..499bef7e2375 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -88,12 +88,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "freeswitch";
-  version = "1.10.9";
+  version = "1.10.10";
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw=";
+    sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts=";
   };
 
   postPatch = ''

From 5b534d467b81f5c06c7bbbfd6e1e81247d5be6a3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 28 Jul 2023 19:26:00 +0100
Subject: [PATCH 03/43] bind: 9.18.16 -> 9.18.17

Changes: https://downloads.isc.org/isc/bind9/9.18.17/doc/arm/html/notes.html#notes-for-bind-9-18-17
(cherry picked from commit 0092231e840431525cd583c7069e4e53e89fd14b)
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 6d13c600a702..fcda25cabfdc 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.18.16";
+  version = "9.18.17";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-yII0/gfudcPIqeWRUv7mS3FGQ96OIs+Y2j200LV+B3U=";
+    hash = "sha256-veHFAXuB0decaeuPU38uUDL9NiOs3V7oMNT3S8JINFg=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From a8849b50717e1f1d2f127d44dbf0a22a480c091b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 19 Aug 2023 09:11:35 +0100
Subject: [PATCH 04/43] bind: 9.18.17 -> 9.18.18

While at it added trivial updater.

Changes: https://bind9.readthedocs.io/en/v9.18.18/notes.html#notes-for-bind-9-18-18
(cherry picked from commit d932fc01631d0853c1233aa3a5a1c69b1ad84e7a)
---
 pkgs/servers/dns/bind/default.nix | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index fcda25cabfdc..a162bd1558fb 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -5,15 +5,16 @@
 , enableGSSAPI ? true, libkrb5
 , buildPackages, nixosTests
 , cmocka, tzdata
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.18.17";
+  version = "9.18.18";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-veHFAXuB0decaeuPU38uUDL9NiOs3V7oMNT3S8JINFg=";
+    hash = "sha256-1zXNwSemxXCb3kdbW/FvohM/Nv26IC98PDfRNOUZIWA=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -75,11 +76,21 @@ stdenv.mkDerivation rec {
     sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) bind;
-    prometheus-exporter = nixosTests.prometheus-exporters.bind;
-    kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
-    kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
+  passthru = {
+    tests = {
+      inherit (nixosTests) bind;
+      prometheus-exporter = nixosTests.prometheus-exporters.bind;
+      kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
+      kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
+    };
+
+    updateScript = gitUpdater {
+      # No nicer place to find latest stable release.
+      url = "https://gitlab.isc.org/isc-projects/bind9.git";
+      rev-prefix = "v";
+      # Avoid unstable 9.19 releases.
+      odd-unstable = true;
+    };
   };
 
   meta = with lib; {

From 3195ea3e72857d3b0f31af2a38220183bb9845b5 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Wed, 20 Sep 2023 21:32:41 +0000
Subject: [PATCH 05/43] bind: 9.18.18 -> 9.18.19

https://downloads.isc.org/isc/bind9/cur/9.18/CHANGES
https://downloads.isc.org/isc/bind9/9.18.19/doc/arm/html/notes.html#notes-for-bind-9-18-19

Fixes CVE-2023-3341
Fixes CVE-2023-4236

(cherry picked from commit b0c03e1684769d5e7a30c4e7bb944aa62c8201d2)
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index a162bd1558fb..9a0148ba496a 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.18.18";
+  version = "9.18.19";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-1zXNwSemxXCb3kdbW/FvohM/Nv26IC98PDfRNOUZIWA=";
+    hash = "sha256-EV4JwFQ5vrreHScu2gj6iOs7YBKe3vaQWIyHpNJ2Esw=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 0ec35327344ca2f5bb237551eae539ca768729b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 1 Sep 2023 09:13:10 +0200
Subject: [PATCH 06/43] bind: disable tests on *all* 32-bit platforms

https://github.com/NixOS/nixpkgs/pull/250563#issuecomment-1702271179
https://gitlab.isc.org/isc-projects/bind9/-/issues/4269#note_397062
(cherry picked from commit 5842d103dc043697692265ecc65572b590e3ab37)
---
 pkgs/servers/dns/bind/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 9a0148ba496a..dc7d1eaec3fd 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -64,7 +64,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   # TODO: investigate the aarch64-linux failures; see this and linked discussions:
   # https://github.com/NixOS/nixpkgs/pull/192962
-  doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux);
+  doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux)
+    # https://gitlab.isc.org/isc-projects/bind9/-/issues/4269
+    && !is32bit;
   checkTarget = "unit";
   checkInputs = [
     cmocka

From 5669fc7c3f8a3e81d565407ecb1e7d6b73c1a57f Mon Sep 17 00:00:00 2001
From: gbtb <goodbetterthebeast3@gmail.com>
Date: Tue, 19 Sep 2023 00:38:02 +1000
Subject: [PATCH 07/43] rocketchat-desktop: 3.8.11 -> 3.9.7

(cherry picked from commit 057cd2a739428b4c7b5168f1f39a67bc9f3d44e1)
---
 .../instant-messengers/rocketchat-desktop/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
index 95bd9de69ee3..6bee6f1476a2 100644
--- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
@@ -4,11 +4,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "rocketchat-desktop";
-  version = "3.8.11";
+  version = "3.9.7";
 
   src = fetchurl {
     url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
-    sha256 = "sha256-gRMoLzCAXByLVtzYAZnhmbgbfsav6CkbP3ZE0NDdlMw=";
+    hash = "sha256-DxY8cXWHBboH6Uh2i9DSJ2F8/OaGTRlIEaLzhQpXnKk=";
   };
 
   nativeBuildInputs = [

From 8137b82bb3d89d6955a8034e443a6be7e9c75893 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Tue, 20 Jun 2023 12:16:25 +0200
Subject: [PATCH 08/43] fluffychat: 1.11.2 -> 1.12.1

(cherry picked from commit b59147582366aedf9d515d7e5301efc7f746f6e3)
---
 .../instant-messengers/fluffychat/default.nix |  10 +-
 .../instant-messengers/fluffychat/deps.json   | 671 ++++++++----------
 2 files changed, 316 insertions(+), 365 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 2a8ebf35c873..09d2af372a28 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -1,24 +1,24 @@
 { lib
 , fetchFromGitLab
 , imagemagick
-, flutter37
+, flutter
 , makeDesktopItem
 , gnome
 }:
 
-flutter37.buildFlutterApplication rec {
-  version = "1.11.2";
+flutter.buildFlutterApplication rec {
+  version = "1.12.1";
   name = "fluffychat";
 
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "fluffychat";
     rev = "v${version}";
-    hash = "sha256-vHzZDkSgxcZf3y/+A645hxBverm34J5xNnNwyxnSVUA=";
+    hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I=";
   };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-u8YI4UBnEfPpvjBfhbo4LGolb56w94EiUlnLlYITdXQ=";
+  vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE=";
 
   desktopItem = makeDesktopItem {
     name = "Fluffychat";
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
index 111fc2812faf..ab3c8684d557 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "fluffychat",
-    "version": "1.11.2+3360",
+    "version": "1.12.0+3452",
     "kind": "root",
     "source": "root",
     "dependencies": [
@@ -29,10 +29,14 @@
       "flutter_blurhash",
       "flutter_cache_manager",
       "flutter_foreground_task",
+      "flutter_highlighter",
+      "flutter_html",
+      "flutter_html_table",
+      "flutter_linkify",
       "flutter_local_notifications",
       "flutter_localizations",
       "flutter_map",
-      "flutter_matrix_html",
+      "flutter_math_fork",
       "flutter_olm",
       "flutter_openssl_crypto",
       "flutter_ringtone_player",
@@ -52,9 +56,9 @@
       "just_audio_mpv",
       "keyboard_shortcuts",
       "latlong2",
+      "linkify",
       "matrix",
       "matrix_homeserver_recommendations",
-      "matrix_link_text",
       "native_imaging",
       "package_info_plus",
       "path_provider",
@@ -90,56 +94,55 @@
       "integration_test",
       "msix",
       "translations_cleaner",
-      "ffi",
       "flutter_secure_storage_windows",
-      "geolocator_android"
+      "geolocator_android",
+      "wakelock_windows"
     ]
   },
   {
-    "name": "geolocator_android",
-    "version": "1.0.1",
+    "name": "wakelock_windows",
+    "version": "0.2.2",
+    "kind": "transitive",
+    "source": "git",
+    "dependencies": [
+      "flutter",
+      "wakelock_platform_interface",
+      "win32"
+    ]
+  },
+  {
+    "name": "win32",
+    "version": "4.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi"
+    ]
+  },
+  {
+    "name": "ffi",
+    "version": "2.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "wakelock_platform_interface",
+    "version": "0.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "geolocator_platform_interface"
-    ]
-  },
-  {
-    "name": "geolocator_platform_interface",
-    "version": "2.3.6",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "plugin_platform_interface",
-      "vector_math",
       "meta"
     ]
   },
   {
     "name": "meta",
-    "version": "1.8.0",
+    "version": "1.9.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
-  {
-    "name": "vector_math",
-    "version": "2.1.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "plugin_platform_interface",
-    "version": "2.1.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "meta"
-    ]
-  },
   {
     "name": "flutter",
     "version": "0.0.0",
@@ -162,6 +165,13 @@
     "source": "sdk",
     "dependencies": []
   },
+  {
+    "name": "vector_math",
+    "version": "2.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "material_color_utilities",
     "version": "0.2.0",
@@ -171,7 +181,7 @@
   },
   {
     "name": "js",
-    "version": "0.6.5",
+    "version": "0.6.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -180,18 +190,49 @@
   },
   {
     "name": "collection",
-    "version": "1.17.0",
+    "version": "1.17.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "characters",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
+  {
+    "name": "geolocator_android",
+    "version": "1.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "geolocator_platform_interface"
+    ]
+  },
+  {
+    "name": "geolocator_platform_interface",
+    "version": "2.3.6",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface",
+      "vector_math",
+      "meta"
+    ]
+  },
+  {
+    "name": "plugin_platform_interface",
+    "version": "2.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta"
+    ]
+  },
   {
     "name": "flutter_secure_storage_windows",
     "version": "1.1.2",
@@ -199,13 +240,6 @@
     "source": "git",
     "dependencies": []
   },
-  {
-    "name": "ffi",
-    "version": "2.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
   {
     "name": "translations_cleaner",
     "version": "0.0.5",
@@ -258,7 +292,7 @@
   },
   {
     "name": "path",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -275,7 +309,7 @@
   },
   {
     "name": "async",
-    "version": "2.10.0",
+    "version": "2.11.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -292,7 +326,7 @@
   },
   {
     "name": "msix",
-    "version": "3.7.0",
+    "version": "3.11.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -310,7 +344,7 @@
   },
   {
     "name": "cli_util",
-    "version": "0.3.5",
+    "version": "0.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -339,7 +373,7 @@
   },
   {
     "name": "image",
-    "version": "3.1.3",
+    "version": "4.0.17",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -350,7 +384,7 @@
   },
   {
     "name": "xml",
-    "version": "5.4.1",
+    "version": "6.2.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -437,13 +471,11 @@
       "flutter_test",
       "path",
       "vm_service",
-      "archive",
       "async",
       "boolean_selector",
       "characters",
       "clock",
       "collection",
-      "crypto",
       "fake_async",
       "file",
       "js",
@@ -457,18 +489,16 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "typed_data",
       "vector_math",
       "webdriver"
     ]
   },
   {
     "name": "webdriver",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "archive",
       "matcher",
       "path",
       "stack_trace",
@@ -493,17 +523,20 @@
   },
   {
     "name": "matcher",
-    "version": "0.12.13",
+    "version": "0.12.15",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
+      "async",
       "meta",
-      "stack_trace"
+      "stack_trace",
+      "term_glyph",
+      "test_api"
     ]
   },
   {
     "name": "test_api",
-    "version": "0.4.16",
+    "version": "0.5.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -557,7 +590,7 @@
   },
   {
     "name": "vm_service",
-    "version": "9.4.0",
+    "version": "11.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -603,13 +636,11 @@
       "meta",
       "vm_service",
       "webdriver",
-      "archive",
       "async",
       "boolean_selector",
       "characters",
       "clock",
       "collection",
-      "crypto",
       "js",
       "matcher",
       "material_color_utilities",
@@ -622,7 +653,6 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "typed_data",
       "vector_math"
     ]
   },
@@ -678,16 +708,16 @@
   },
   {
     "name": "flutter_native_splash",
-    "version": "2.2.0+1",
+    "version": "2.2.19",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
       "args",
       "flutter",
       "flutter_web_plugins",
-      "image",
       "js",
-      "lint",
+      "html",
+      "image",
       "meta",
       "path",
       "universal_io",
@@ -707,11 +737,23 @@
     ]
   },
   {
-    "name": "lint",
-    "version": "1.10.0",
+    "name": "html",
+    "version": "0.15.3",
     "kind": "transitive",
     "source": "hosted",
-    "dependencies": []
+    "dependencies": [
+      "csslib",
+      "source_span"
+    ]
+  },
+  {
+    "name": "csslib",
+    "version": "0.17.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "source_span"
+    ]
   },
   {
     "name": "flutter_web_plugins",
@@ -812,25 +854,6 @@
       "typed_data"
     ]
   },
-  {
-    "name": "html",
-    "version": "0.15.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "csslib",
-      "source_span"
-    ]
-  },
-  {
-    "name": "csslib",
-    "version": "0.17.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "source_span"
-    ]
-  },
   {
     "name": "ansicolor",
     "version": "2.0.1",
@@ -914,7 +937,7 @@
   },
   {
     "name": "webrtc_interface",
-    "version": "1.0.11",
+    "version": "1.0.13",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
@@ -933,36 +956,6 @@
       "wakelock_windows"
     ]
   },
-  {
-    "name": "wakelock_windows",
-    "version": "0.2.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "wakelock_platform_interface",
-      "win32"
-    ]
-  },
-  {
-    "name": "win32",
-    "version": "3.1.3",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi"
-    ]
-  },
-  {
-    "name": "wakelock_platform_interface",
-    "version": "0.3.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "meta"
-    ]
-  },
   {
     "name": "wakelock_web",
     "version": "0.4.0",
@@ -1025,7 +1018,7 @@
   },
   {
     "name": "url_launcher_windows",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1066,7 +1059,7 @@
   },
   {
     "name": "url_launcher_linux",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1275,7 +1268,7 @@
   },
   {
     "name": "path_provider_windows",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1436,7 +1429,7 @@
   },
   {
     "name": "share_plus",
-    "version": "6.3.1",
+    "version": "7.0.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1457,7 +1450,7 @@
   },
   {
     "name": "share_plus_platform_interface",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1738,34 +1731,23 @@
   },
   {
     "name": "package_info_plus",
-    "version": "1.4.3+1",
+    "version": "4.0.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
-      "flutter",
-      "package_info_plus_platform_interface",
-      "package_info_plus_linux",
-      "package_info_plus_macos",
-      "package_info_plus_windows",
-      "package_info_plus_web"
-    ]
-  },
-  {
-    "name": "package_info_plus_web",
-    "version": "1.0.6",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
+      "ffi",
       "flutter",
       "flutter_web_plugins",
       "http",
       "meta",
-      "package_info_plus_platform_interface"
+      "path",
+      "package_info_plus_platform_interface",
+      "win32"
     ]
   },
   {
     "name": "package_info_plus_platform_interface",
-    "version": "1.0.2",
+    "version": "2.0.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1774,38 +1756,6 @@
       "plugin_platform_interface"
     ]
   },
-  {
-    "name": "package_info_plus_windows",
-    "version": "2.1.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "package_info_plus_platform_interface",
-      "ffi",
-      "flutter",
-      "win32"
-    ]
-  },
-  {
-    "name": "package_info_plus_macos",
-    "version": "1.3.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
-    ]
-  },
-  {
-    "name": "package_info_plus_linux",
-    "version": "1.0.5",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "package_info_plus_platform_interface",
-      "flutter",
-      "path"
-    ]
-  },
   {
     "name": "native_imaging",
     "version": "0.1.0",
@@ -1816,16 +1766,6 @@
       "ffi"
     ]
   },
-  {
-    "name": "matrix_link_text",
-    "version": "1.0.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "url_launcher"
-    ]
-  },
   {
     "name": "matrix_homeserver_recommendations",
     "version": "0.3.0",
@@ -1838,7 +1778,7 @@
   },
   {
     "name": "matrix_api_lite",
-    "version": "1.1.10",
+    "version": "1.6.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1856,7 +1796,7 @@
   },
   {
     "name": "matrix",
-    "version": "0.18.0",
+    "version": "0.20.5",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1954,7 +1894,7 @@
   },
   {
     "name": "blurhash_dart",
-    "version": "1.1.0",
+    "version": "1.2.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1971,6 +1911,13 @@
       "collection"
     ]
   },
+  {
+    "name": "linkify",
+    "version": "5.0.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "latlong2",
     "version": "0.8.1",
@@ -1982,11 +1929,12 @@
   },
   {
     "name": "intl",
-    "version": "0.17.0",
+    "version": "0.18.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "clock",
+      "meta",
       "path"
     ]
   },
@@ -2237,19 +2185,21 @@
   },
   {
     "name": "flutter_webrtc",
-    "version": "0.9.24",
+    "version": "0.9.31",
     "kind": "direct",
     "source": "git",
     "dependencies": [
+      "collection",
       "dart_webrtc",
       "flutter",
+      "js",
       "path_provider",
       "webrtc_interface"
     ]
   },
   {
     "name": "dart_webrtc",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2462,54 +2412,10 @@
       "flutter"
     ]
   },
-  {
-    "name": "flutter_matrix_html",
-    "version": "1.1.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "html",
-      "flutter",
-      "cached_network_image",
-      "matrix_link_text",
-      "flutter_math_fork",
-      "flutter_highlight",
-      "isolate",
-      "highlight",
-      "crypto",
-      "csslib"
-    ]
-  },
-  {
-    "name": "highlight",
-    "version": "0.7.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection"
-    ]
-  },
-  {
-    "name": "isolate",
-    "version": "2.1.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "flutter_highlight",
-    "version": "0.7.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "highlight"
-    ]
-  },
   {
     "name": "flutter_math_fork",
-    "version": "0.4.2+2",
-    "kind": "transitive",
+    "version": "0.7.1",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
@@ -2522,32 +2428,39 @@
   },
   {
     "name": "flutter_svg",
-    "version": "0.22.0",
+    "version": "2.0.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "meta",
-      "path_drawing",
-      "vector_math",
-      "xml"
+      "vector_graphics",
+      "vector_graphics_codec",
+      "vector_graphics_compiler"
     ]
   },
   {
-    "name": "path_drawing",
-    "version": "0.5.1+1",
+    "name": "vector_graphics_compiler",
+    "version": "1.1.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "vector_math",
+      "args",
       "meta",
       "path_parsing",
-      "flutter"
+      "xml",
+      "vector_graphics_codec"
     ]
   },
+  {
+    "name": "vector_graphics_codec",
+    "version": "1.1.5",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "path_parsing",
-    "version": "0.2.1",
+    "version": "1.0.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2556,111 +2469,13 @@
     ]
   },
   {
-    "name": "cached_network_image",
-    "version": "3.2.3",
+    "name": "vector_graphics",
+    "version": "1.1.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "flutter_cache_manager",
-      "octo_image",
-      "cached_network_image_platform_interface",
-      "cached_network_image_web"
-    ]
-  },
-  {
-    "name": "cached_network_image_web",
-    "version": "1.0.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "flutter_cache_manager",
-      "cached_network_image_platform_interface"
-    ]
-  },
-  {
-    "name": "cached_network_image_platform_interface",
-    "version": "2.0.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "flutter_cache_manager"
-    ]
-  },
-  {
-    "name": "flutter_cache_manager",
-    "version": "3.3.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "clock",
-      "collection",
-      "file",
-      "flutter",
-      "http",
-      "path",
-      "path_provider",
-      "pedantic",
-      "rxdart",
-      "sqflite",
-      "uuid"
-    ]
-  },
-  {
-    "name": "sqflite",
-    "version": "2.2.6",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "sqflite_common",
-      "path"
-    ]
-  },
-  {
-    "name": "sqflite_common",
-    "version": "2.4.3",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "synchronized",
-      "path",
-      "meta"
-    ]
-  },
-  {
-    "name": "synchronized",
-    "version": "3.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "pedantic",
-    "version": "1.11.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "octo_image",
-    "version": "1.0.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "flutter_blurhash"
-    ]
-  },
-  {
-    "name": "flutter_blurhash",
-    "version": "0.7.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
+      "vector_graphics_codec"
     ]
   },
   {
@@ -2810,7 +2625,7 @@
   },
   {
     "name": "dbus",
-    "version": "0.7.3",
+    "version": "0.7.8",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2820,6 +2635,88 @@
       "xml"
     ]
   },
+  {
+    "name": "flutter_linkify",
+    "version": "6.0.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "linkify"
+    ]
+  },
+  {
+    "name": "flutter_html_table",
+    "version": "3.0.0-beta.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "html",
+      "flutter_html",
+      "flutter_layout_grid"
+    ]
+  },
+  {
+    "name": "flutter_layout_grid",
+    "version": "2.0.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "collection",
+      "meta",
+      "quiver"
+    ]
+  },
+  {
+    "name": "quiver",
+    "version": "3.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "matcher"
+    ]
+  },
+  {
+    "name": "flutter_html",
+    "version": "3.0.0-beta.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "html",
+      "csslib",
+      "collection",
+      "list_counter",
+      "flutter"
+    ]
+  },
+  {
+    "name": "list_counter",
+    "version": "1.0.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "flutter_highlighter",
+    "version": "0.1.1",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "highlighter"
+    ]
+  },
+  {
+    "name": "highlighter",
+    "version": "0.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection"
+    ]
+  },
   {
     "name": "flutter_foreground_task",
     "version": "3.10.0",
@@ -2834,6 +2731,70 @@
       "shared_preferences_ios"
     ]
   },
+  {
+    "name": "flutter_cache_manager",
+    "version": "3.3.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "clock",
+      "collection",
+      "file",
+      "flutter",
+      "http",
+      "path",
+      "path_provider",
+      "pedantic",
+      "rxdart",
+      "sqflite",
+      "uuid"
+    ]
+  },
+  {
+    "name": "sqflite",
+    "version": "2.2.6",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "sqflite_common",
+      "path"
+    ]
+  },
+  {
+    "name": "sqflite_common",
+    "version": "2.4.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "synchronized",
+      "path",
+      "meta"
+    ]
+  },
+  {
+    "name": "synchronized",
+    "version": "3.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "pedantic",
+    "version": "1.11.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "flutter_blurhash",
+    "version": "0.7.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
   {
     "name": "flutter_app_lock",
     "version": "3.0.0",
@@ -2854,7 +2815,7 @@
   },
   {
     "name": "file_picker",
-    "version": "5.2.6",
+    "version": "5.3.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3063,7 +3024,7 @@
   },
   {
     "name": "adaptive_dialog",
-    "version": "1.8.2",
+    "version": "1.9.0-no-macos.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3072,19 +3033,9 @@
       "dynamic_color",
       "flutter",
       "intersperse",
-      "macos_ui",
       "meta"
     ]
   },
-  {
-    "name": "macos_ui",
-    "version": "1.12.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
-    ]
-  },
   {
     "name": "intersperse",
     "version": "2.0.0",

From c350095e9eaea481349ec1a197cc970cab726281 Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Tue, 1 Aug 2023 00:39:16 +0300
Subject: [PATCH 09/43] fluffychat: use 'pname' instead of 'name'

Among other things, this way the version
is displayed correctly in package search

(cherry picked from commit 55a4d6be907ba43d79e40da9f7faf27deb4a80ef)
---
 .../networking/instant-messengers/fluffychat/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 09d2af372a28..f58f62a7ae17 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -7,8 +7,8 @@
 }:
 
 flutter.buildFlutterApplication rec {
+  pname = "fluffychat";
   version = "1.12.1";
-  name = "fluffychat";
 
   src = fetchFromGitLab {
     owner = "famedly";

From 89eeefd9e77609863aa9aba8963694a55afbc8b5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 14 Aug 2023 14:27:40 +0800
Subject: [PATCH 10/43] fluffychat: 1.12.1 -> 1.13.0

(cherry picked from commit e12ae52757fd6af24601f4fae8a25777ab3f3304)
---
 .../instant-messengers/fluffychat/default.nix |  25 +-
 .../instant-messengers/fluffychat/deps.json   | 609 +++++++++++-------
 2 files changed, 403 insertions(+), 231 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index f58f62a7ae17..f6ab1a5d17fe 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -1,24 +1,30 @@
 { lib
-, fetchFromGitLab
+, fetchFromGitHub
 , imagemagick
+, mesa
+, libdrm
 , flutter
+, pulseaudio
 , makeDesktopItem
 , gnome
 }:
 
+let
+  libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ];
+in
 flutter.buildFlutterApplication rec {
   pname = "fluffychat";
-  version = "1.12.1";
+  version = "1.13.0";
 
-  src = fetchFromGitLab {
-    owner = "famedly";
+  src = fetchFromGitHub {
+    owner = "krille-chan";
     repo = "fluffychat";
-    rev = "v${version}";
-    hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc=";
   };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE=";
+  vendorHash = "sha256-Ot96+EF8PgYQmXn0hvIWzN8StuzTgQzakRO3yf7PJAU=";
 
   desktopItem = makeDesktopItem {
     name = "Fluffychat";
@@ -30,6 +36,7 @@ flutter.buildFlutterApplication rec {
   };
 
   nativeBuildInputs = [ imagemagick ];
+  runtimeDependencies = [ pulseaudio ];
   extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin";
   postInstall = ''
     FAV=$out/app/data/flutter_assets/assets/favicon.png
@@ -45,8 +52,12 @@ flutter.buildFlutterApplication rec {
     done
     substituteInPlace $out/share/applications/*.desktop \
       --subst-var out
+
+    patchelf --add-rpath ${libwebrtcRpath} $out/app/lib/libwebrtc.so
   '';
 
+  env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
+
   meta = with lib; {
     description = "Chat with your friends (matrix client)";
     homepage = "https://fluffychat.im/";
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
index ab3c8684d557..3261bffda293 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
@@ -1,12 +1,13 @@
 [
   {
     "name": "fluffychat",
-    "version": "1.12.0+3452",
+    "version": "1.13.0+3514",
     "kind": "root",
     "source": "root",
     "dependencies": [
       "adaptive_dialog",
       "animations",
+      "archive",
       "badges",
       "blurhash_dart",
       "callkeep",
@@ -61,6 +62,7 @@
       "matrix_homeserver_recommendations",
       "native_imaging",
       "package_info_plus",
+      "pasteboard",
       "path_provider",
       "permission_handler",
       "pin_code_text_field",
@@ -94,7 +96,6 @@
       "integration_test",
       "msix",
       "translations_cleaner",
-      "flutter_secure_storage_windows",
       "geolocator_android",
       "wakelock_windows"
     ]
@@ -112,7 +113,7 @@
   },
   {
     "name": "win32",
-    "version": "4.1.4",
+    "version": "5.0.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -121,7 +122,7 @@
   },
   {
     "name": "ffi",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -233,13 +234,6 @@
       "meta"
     ]
   },
-  {
-    "name": "flutter_secure_storage_windows",
-    "version": "1.1.2",
-    "kind": "transitive",
-    "source": "git",
-    "dependencies": []
-  },
   {
     "name": "translations_cleaner",
     "version": "0.0.5",
@@ -252,7 +246,7 @@
   },
   {
     "name": "glob",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -319,18 +313,17 @@
   },
   {
     "name": "args",
-    "version": "2.4.0",
+    "version": "2.4.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "msix",
-    "version": "3.11.1",
+    "version": "3.15.0",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
-      "flutter",
       "args",
       "yaml",
       "path",
@@ -363,7 +356,7 @@
   },
   {
     "name": "pub_semver",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -384,7 +377,7 @@
   },
   {
     "name": "xml",
-    "version": "6.2.2",
+    "version": "6.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -395,7 +388,7 @@
   },
   {
     "name": "petitparser",
-    "version": "5.1.0",
+    "version": "5.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -404,17 +397,29 @@
   },
   {
     "name": "archive",
-    "version": "3.3.2",
-    "kind": "transitive",
+    "version": "3.3.7",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "crypto",
-      "path"
+      "path",
+      "pointycastle"
     ]
   },
   {
-    "name": "crypto",
-    "version": "3.0.2",
+    "name": "pointycastle",
+    "version": "3.7.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "convert",
+      "js"
+    ]
+  },
+  {
+    "name": "convert",
+    "version": "3.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -423,16 +428,25 @@
   },
   {
     "name": "typed_data",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "collection"
     ]
   },
+  {
+    "name": "crypto",
+    "version": "3.0.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "typed_data"
+    ]
+  },
   {
     "name": "get_it",
-    "version": "7.2.0",
+    "version": "7.6.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -451,7 +465,7 @@
   },
   {
     "name": "yaml",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -708,7 +722,7 @@
   },
   {
     "name": "flutter_native_splash",
-    "version": "2.2.19",
+    "version": "2.3.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -727,7 +741,7 @@
   },
   {
     "name": "universal_io",
-    "version": "2.2.0",
+    "version": "2.2.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -738,7 +752,7 @@
   },
   {
     "name": "html",
-    "version": "0.15.3",
+    "version": "0.15.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -748,7 +762,7 @@
   },
   {
     "name": "csslib",
-    "version": "0.17.2",
+    "version": "0.17.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -772,7 +786,7 @@
   },
   {
     "name": "flutter_lints",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -781,14 +795,14 @@
   },
   {
     "name": "lints",
-    "version": "2.0.1",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "dart_code_metrics",
-    "version": "4.21.3",
+    "version": "5.7.5",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -798,32 +812,45 @@
       "args",
       "collection",
       "crypto",
+      "dart_code_metrics_presets",
       "file",
       "glob",
       "html",
+      "http",
       "meta",
       "path",
       "platform",
       "pub_updater",
       "source_span",
+      "uuid",
       "xml",
       "yaml"
     ]
   },
+  {
+    "name": "uuid",
+    "version": "3.0.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "crypto"
+    ]
+  },
   {
     "name": "pub_updater",
-    "version": "0.2.4",
+    "version": "0.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "http",
       "json_annotation",
-      "process"
+      "process",
+      "pub_semver"
     ]
   },
   {
     "name": "json_annotation",
-    "version": "4.8.0",
+    "version": "4.8.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -832,14 +859,13 @@
   },
   {
     "name": "http",
-    "version": "0.13.5",
+    "version": "0.13.6",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "async",
       "http_parser",
-      "meta",
-      "path"
+      "meta"
     ]
   },
   {
@@ -854,6 +880,13 @@
       "typed_data"
     ]
   },
+  {
+    "name": "dart_code_metrics_presets",
+    "version": "1.8.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "ansicolor",
     "version": "2.0.1",
@@ -876,7 +909,7 @@
   },
   {
     "name": "dart_style",
-    "version": "2.2.5",
+    "version": "2.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -889,7 +922,7 @@
   },
   {
     "name": "analyzer",
-    "version": "5.1.0",
+    "version": "5.13.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -909,7 +942,7 @@
   },
   {
     "name": "watcher",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -917,18 +950,9 @@
       "path"
     ]
   },
-  {
-    "name": "convert",
-    "version": "3.1.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "typed_data"
-    ]
-  },
   {
     "name": "_fe_analyzer_shared",
-    "version": "49.0.0",
+    "version": "61.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -937,7 +961,7 @@
   },
   {
     "name": "webrtc_interface",
-    "version": "1.0.13",
+    "version": "1.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
@@ -1002,7 +1026,7 @@
   },
   {
     "name": "url_launcher",
-    "version": "6.1.10",
+    "version": "6.1.12",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1018,7 +1042,7 @@
   },
   {
     "name": "url_launcher_windows",
-    "version": "3.0.6",
+    "version": "3.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1028,7 +1052,7 @@
   },
   {
     "name": "url_launcher_platform_interface",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1038,7 +1062,7 @@
   },
   {
     "name": "url_launcher_web",
-    "version": "2.0.16",
+    "version": "2.0.18",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1049,7 +1073,7 @@
   },
   {
     "name": "url_launcher_macos",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1069,7 +1093,7 @@
   },
   {
     "name": "url_launcher_ios",
-    "version": "6.1.3",
+    "version": "6.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1079,7 +1103,7 @@
   },
   {
     "name": "url_launcher_android",
-    "version": "6.0.25",
+    "version": "6.0.36",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1098,7 +1122,7 @@
   },
   {
     "name": "video_player",
-    "version": "2.6.0",
+    "version": "2.7.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1112,7 +1136,7 @@
   },
   {
     "name": "video_player_web",
-    "version": "2.0.15",
+    "version": "2.0.16",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1133,7 +1157,7 @@
   },
   {
     "name": "video_player_avfoundation",
-    "version": "2.4.2",
+    "version": "2.4.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1143,7 +1167,7 @@
   },
   {
     "name": "video_player_android",
-    "version": "2.4.2",
+    "version": "2.4.9",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1162,16 +1186,54 @@
   },
   {
     "name": "vibration",
-    "version": "1.7.6",
+    "version": "1.8.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
-      "flutter"
+      "flutter",
+      "device_info_plus"
+    ]
+  },
+  {
+    "name": "device_info_plus",
+    "version": "9.0.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "device_info_plus_platform_interface",
+      "ffi",
+      "file",
+      "flutter",
+      "flutter_web_plugins",
+      "meta",
+      "win32",
+      "win32_registry"
+    ]
+  },
+  {
+    "name": "win32_registry",
+    "version": "1.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "win32"
+    ]
+  },
+  {
+    "name": "device_info_plus_platform_interface",
+    "version": "7.0.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "meta",
+      "plugin_platform_interface"
     ]
   },
   {
     "name": "universal_html",
-    "version": "2.2.1",
+    "version": "2.2.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1195,7 +1257,7 @@
   },
   {
     "name": "unifiedpush",
-    "version": "4.0.3",
+    "version": "5.0.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1207,7 +1269,7 @@
   },
   {
     "name": "unifiedpush_android",
-    "version": "1.1.2",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1218,7 +1280,7 @@
   },
   {
     "name": "unifiedpush_platform_interface",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1228,15 +1290,14 @@
   },
   {
     "name": "shared_preferences",
-    "version": "2.0.15",
+    "version": "2.2.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
       "shared_preferences_android",
-      "shared_preferences_ios",
+      "shared_preferences_foundation",
       "shared_preferences_linux",
-      "shared_preferences_macos",
       "shared_preferences_platform_interface",
       "shared_preferences_web",
       "shared_preferences_windows"
@@ -1244,7 +1305,7 @@
   },
   {
     "name": "shared_preferences_windows",
-    "version": "2.1.5",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1258,7 +1319,7 @@
   },
   {
     "name": "shared_preferences_platform_interface",
-    "version": "2.1.1",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1268,7 +1329,7 @@
   },
   {
     "name": "path_provider_windows",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1292,7 +1353,7 @@
   },
   {
     "name": "shared_preferences_web",
-    "version": "2.0.6",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1301,19 +1362,9 @@
       "shared_preferences_platform_interface"
     ]
   },
-  {
-    "name": "shared_preferences_macos",
-    "version": "2.0.5",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "shared_preferences_platform_interface"
-    ]
-  },
   {
     "name": "shared_preferences_linux",
-    "version": "2.1.5",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1327,7 +1378,7 @@
   },
   {
     "name": "path_provider_linux",
-    "version": "2.1.10",
+    "version": "2.1.11",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1340,7 +1391,7 @@
   },
   {
     "name": "xdg_directories",
-    "version": "0.2.0+3",
+    "version": "1.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1350,8 +1401,8 @@
     ]
   },
   {
-    "name": "shared_preferences_ios",
-    "version": "2.1.1",
+    "name": "shared_preferences_foundation",
+    "version": "2.3.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1361,7 +1412,7 @@
   },
   {
     "name": "shared_preferences_android",
-    "version": "2.0.17",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1429,7 +1480,7 @@
   },
   {
     "name": "share_plus",
-    "version": "7.0.0",
+    "version": "7.0.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1463,18 +1514,9 @@
       "uuid"
     ]
   },
-  {
-    "name": "uuid",
-    "version": "3.0.7",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "crypto"
-    ]
-  },
   {
     "name": "path_provider",
-    "version": "2.0.13",
+    "version": "2.0.15",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1488,7 +1530,7 @@
   },
   {
     "name": "path_provider_foundation",
-    "version": "2.2.0",
+    "version": "2.2.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1498,7 +1540,7 @@
   },
   {
     "name": "path_provider_android",
-    "version": "2.0.24",
+    "version": "2.0.27",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1610,7 +1652,7 @@
   },
   {
     "name": "qr_flutter",
-    "version": "4.0.0",
+    "version": "4.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1620,7 +1662,7 @@
   },
   {
     "name": "qr",
-    "version": "2.1.0",
+    "version": "3.0.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1676,7 +1718,7 @@
   },
   {
     "name": "permission_handler",
-    "version": "10.2.0",
+    "version": "10.4.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1690,7 +1732,7 @@
   },
   {
     "name": "permission_handler_platform_interface",
-    "version": "3.9.0",
+    "version": "3.11.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1701,7 +1743,7 @@
   },
   {
     "name": "permission_handler_windows",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1711,7 +1753,7 @@
   },
   {
     "name": "permission_handler_apple",
-    "version": "9.0.7",
+    "version": "9.1.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1721,7 +1763,7 @@
   },
   {
     "name": "permission_handler_android",
-    "version": "10.2.0",
+    "version": "10.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1729,9 +1771,20 @@
       "permission_handler_platform_interface"
     ]
   },
+  {
+    "name": "pasteboard",
+    "version": "0.2.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "js"
+    ]
+  },
   {
     "name": "package_info_plus",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1778,7 +1831,7 @@
   },
   {
     "name": "matrix_api_lite",
-    "version": "1.6.1",
+    "version": "1.7.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1796,7 +1849,7 @@
   },
   {
     "name": "matrix",
-    "version": "0.20.5",
+    "version": "0.22.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1820,6 +1873,7 @@
       "random_string",
       "sdp_transform",
       "slugify",
+      "typed_data",
       "webrtc_interface"
     ]
   },
@@ -1877,7 +1931,7 @@
   },
   {
     "name": "canonical_json",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1920,7 +1974,7 @@
   },
   {
     "name": "latlong2",
-    "version": "0.8.1",
+    "version": "0.8.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1952,7 +2006,7 @@
   },
   {
     "name": "tuple",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -1996,7 +2050,7 @@
   },
   {
     "name": "just_audio_platform_interface",
-    "version": "4.2.0",
+    "version": "4.2.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2006,7 +2060,7 @@
   },
   {
     "name": "just_audio",
-    "version": "0.9.31",
+    "version": "0.9.34",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2032,7 +2086,7 @@
   },
   {
     "name": "audio_session",
-    "version": "0.1.13",
+    "version": "0.1.16",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2044,7 +2098,7 @@
   },
   {
     "name": "just_audio_web",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2055,7 +2109,7 @@
   },
   {
     "name": "image_picker",
-    "version": "0.8.7",
+    "version": "1.0.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2063,12 +2117,27 @@
       "image_picker_android",
       "image_picker_for_web",
       "image_picker_ios",
+      "image_picker_linux",
+      "image_picker_macos",
+      "image_picker_platform_interface",
+      "image_picker_windows"
+    ]
+  },
+  {
+    "name": "image_picker_windows",
+    "version": "0.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "file_selector_platform_interface",
+      "file_selector_windows",
+      "flutter",
       "image_picker_platform_interface"
     ]
   },
   {
     "name": "image_picker_platform_interface",
-    "version": "2.6.3",
+    "version": "2.8.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2078,9 +2147,78 @@
       "plugin_platform_interface"
     ]
   },
+  {
+    "name": "file_selector_windows",
+    "version": "0.9.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "cross_file",
+      "file_selector_platform_interface",
+      "flutter"
+    ]
+  },
+  {
+    "name": "file_selector_platform_interface",
+    "version": "2.6.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "cross_file",
+      "flutter",
+      "http",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "image_picker_macos",
+    "version": "0.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "file_selector_macos",
+      "file_selector_platform_interface",
+      "flutter",
+      "image_picker_platform_interface"
+    ]
+  },
+  {
+    "name": "file_selector_macos",
+    "version": "0.9.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "cross_file",
+      "file_selector_platform_interface",
+      "flutter"
+    ]
+  },
+  {
+    "name": "image_picker_linux",
+    "version": "0.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "file_selector_linux",
+      "file_selector_platform_interface",
+      "flutter",
+      "image_picker_platform_interface"
+    ]
+  },
+  {
+    "name": "file_selector_linux",
+    "version": "0.9.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "cross_file",
+      "file_selector_platform_interface",
+      "flutter"
+    ]
+  },
   {
     "name": "image_picker_ios",
-    "version": "0.8.7+1",
+    "version": "0.8.8",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2090,18 +2228,19 @@
   },
   {
     "name": "image_picker_for_web",
-    "version": "2.1.12",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "flutter",
       "flutter_web_plugins",
-      "image_picker_platform_interface"
+      "image_picker_platform_interface",
+      "mime"
     ]
   },
   {
     "name": "image_picker_android",
-    "version": "0.8.6+5",
+    "version": "0.8.7+3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2112,7 +2251,7 @@
   },
   {
     "name": "flutter_plugin_android_lifecycle",
-    "version": "2.0.9",
+    "version": "2.0.15",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2133,7 +2272,7 @@
   },
   {
     "name": "handy_window",
-    "version": "0.1.9",
+    "version": "0.3.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2185,24 +2324,24 @@
   },
   {
     "name": "flutter_webrtc",
-    "version": "0.9.31",
+    "version": "0.9.37",
     "kind": "direct",
-    "source": "git",
+    "source": "hosted",
     "dependencies": [
       "collection",
       "dart_webrtc",
       "flutter",
-      "js",
       "path_provider",
       "webrtc_interface"
     ]
   },
   {
     "name": "dart_webrtc",
-    "version": "1.0.16",
+    "version": "1.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
+      "collection",
       "js",
       "platform_detect",
       "webrtc_interface"
@@ -2220,7 +2359,7 @@
   },
   {
     "name": "flutter_web_auth_2",
-    "version": "2.1.1",
+    "version": "2.1.5",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2242,7 +2381,7 @@
   },
   {
     "name": "flutter_web_auth_2_platform_interface",
-    "version": "2.1.0",
+    "version": "2.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2252,17 +2391,27 @@
   },
   {
     "name": "flutter_typeahead",
-    "version": "4.3.7",
+    "version": "4.6.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "flutter_keyboard_visibility"
+      "flutter_keyboard_visibility",
+      "pointer_interceptor"
+    ]
+  },
+  {
+    "name": "pointer_interceptor",
+    "version": "0.9.3+4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
     ]
   },
   {
     "name": "flutter_keyboard_visibility",
-    "version": "5.4.0",
+    "version": "5.4.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2329,7 +2478,7 @@
   },
   {
     "name": "flutter_secure_storage",
-    "version": "7.0.1",
+    "version": "8.0.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2342,6 +2491,26 @@
       "meta"
     ]
   },
+  {
+    "name": "flutter_secure_storage_windows",
+    "version": "2.0.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_secure_storage_platform_interface"
+    ]
+  },
+  {
+    "name": "flutter_secure_storage_platform_interface",
+    "version": "1.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface"
+    ]
+  },
   {
     "name": "flutter_secure_storage_web",
     "version": "1.1.1",
@@ -2354,19 +2523,9 @@
       "js"
     ]
   },
-  {
-    "name": "flutter_secure_storage_platform_interface",
-    "version": "1.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "plugin_platform_interface"
-    ]
-  },
   {
     "name": "flutter_secure_storage_macos",
-    "version": "2.0.1",
+    "version": "3.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2428,7 +2587,7 @@
   },
   {
     "name": "flutter_svg",
-    "version": "2.0.5",
+    "version": "2.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2440,7 +2599,7 @@
   },
   {
     "name": "vector_graphics_compiler",
-    "version": "1.1.5",
+    "version": "1.1.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2453,7 +2612,7 @@
   },
   {
     "name": "vector_graphics_codec",
-    "version": "1.1.5",
+    "version": "1.1.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -2470,7 +2629,7 @@
   },
   {
     "name": "vector_graphics",
-    "version": "1.1.5",
+    "version": "1.1.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2480,7 +2639,7 @@
   },
   {
     "name": "flutter_map",
-    "version": "3.1.0",
+    "version": "4.0.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2491,7 +2650,6 @@
       "latlong2",
       "meta",
       "polylabel",
-      "positioned_tap_detector_2",
       "proj4dart",
       "tuple",
       "vector_math"
@@ -2542,15 +2700,6 @@
       "meta"
     ]
   },
-  {
-    "name": "positioned_tap_detector_2",
-    "version": "1.0.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
-    ]
-  },
   {
     "name": "polylabel",
     "version": "1.0.1",
@@ -2580,7 +2729,7 @@
   },
   {
     "name": "flutter_local_notifications",
-    "version": "12.0.4",
+    "version": "15.1.0+1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2593,7 +2742,7 @@
   },
   {
     "name": "timezone",
-    "version": "0.9.1",
+    "version": "0.9.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2602,7 +2751,7 @@
   },
   {
     "name": "flutter_local_notifications_platform_interface",
-    "version": "6.0.0",
+    "version": "7.0.0+1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2612,13 +2761,14 @@
   },
   {
     "name": "flutter_local_notifications_linux",
-    "version": "1.0.0",
+    "version": "4.0.0+1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
+      "dbus",
+      "ffi",
       "flutter",
       "flutter_local_notifications_platform_interface",
-      "dbus",
       "path",
       "xdg_directories"
     ]
@@ -2659,7 +2809,7 @@
   },
   {
     "name": "flutter_layout_grid",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2719,21 +2869,19 @@
   },
   {
     "name": "flutter_foreground_task",
-    "version": "3.10.0",
+    "version": "6.0.0+1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
       "plugin_platform_interface",
       "platform",
-      "shared_preferences",
-      "shared_preferences_android",
-      "shared_preferences_ios"
+      "shared_preferences"
     ]
   },
   {
     "name": "flutter_cache_manager",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2744,7 +2892,6 @@
       "http",
       "path",
       "path_provider",
-      "pedantic",
       "rxdart",
       "sqflite",
       "uuid"
@@ -2752,7 +2899,7 @@
   },
   {
     "name": "sqflite",
-    "version": "2.2.6",
+    "version": "2.2.8+4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2763,7 +2910,7 @@
   },
   {
     "name": "sqflite_common",
-    "version": "2.4.3",
+    "version": "2.4.5+1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2774,14 +2921,7 @@
   },
   {
     "name": "synchronized",
-    "version": "3.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "pedantic",
-    "version": "1.11.1",
+    "version": "3.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -2815,7 +2955,7 @@
   },
   {
     "name": "file_picker",
-    "version": "5.3.0",
+    "version": "5.3.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2858,14 +2998,14 @@
   },
   {
     "name": "remove_emoji",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "emoji_picker_flutter",
-    "version": "1.5.2",
+    "version": "1.6.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2877,7 +3017,7 @@
   },
   {
     "name": "dynamic_color",
-    "version": "1.6.2",
+    "version": "1.6.6",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2886,32 +3026,6 @@
       "material_color_utilities"
     ]
   },
-  {
-    "name": "device_info_plus",
-    "version": "8.1.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "device_info_plus_platform_interface",
-      "ffi",
-      "file",
-      "flutter",
-      "flutter_web_plugins",
-      "meta",
-      "win32"
-    ]
-  },
-  {
-    "name": "device_info_plus_platform_interface",
-    "version": "7.0.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "meta",
-      "plugin_platform_interface"
-    ]
-  },
   {
     "name": "desktop_notifications",
     "version": "0.6.3",
@@ -2923,7 +3037,7 @@
   },
   {
     "name": "desktop_lifecycle",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2950,7 +3064,7 @@
   },
   {
     "name": "connectivity_plus",
-    "version": "3.0.3",
+    "version": "4.0.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2984,7 +3098,7 @@
   },
   {
     "name": "chewie",
-    "version": "1.4.0",
+    "version": "1.7.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2992,7 +3106,34 @@
       "flutter",
       "provider",
       "video_player",
-      "wakelock"
+      "wakelock_plus"
+    ]
+  },
+  {
+    "name": "wakelock_plus",
+    "version": "1.1.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "meta",
+      "wakelock_plus_platform_interface",
+      "win32",
+      "dbus",
+      "package_info_plus",
+      "js"
+    ]
+  },
+  {
+    "name": "wakelock_plus_platform_interface",
+    "version": "1.1.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface",
+      "meta"
     ]
   },
   {
@@ -3024,7 +3165,7 @@
   },
   {
     "name": "adaptive_dialog",
-    "version": "1.9.0-no-macos.2",
+    "version": "1.9.0-x-macos-beta.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3033,9 +3174,29 @@
       "dynamic_color",
       "flutter",
       "intersperse",
+      "macos_ui",
       "meta"
     ]
   },
+  {
+    "name": "macos_ui",
+    "version": "2.0.0-beta.6",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "macos_window_utils"
+    ]
+  },
+  {
+    "name": "macos_window_utils",
+    "version": "1.1.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
   {
     "name": "intersperse",
     "version": "2.0.0",

From b3ddd9ac8448627ed1a30cf0e39b62b0f85988ae Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sun, 27 Aug 2023 23:25:02 +1000
Subject: [PATCH 11/43] fluffychat: Resolve dependencies for Flutter 3.13.0

(cherry picked from commit bbc7ae0b8f4c5899a23eeae5e431c04f7e2c4e9c)
---
 .../instant-messengers/fluffychat/default.nix |  2 +-
 .../instant-messengers/fluffychat/deps.json   | 64 +++++++++++--------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index f6ab1a5d17fe..66ba7d3ae41e 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -24,7 +24,7 @@ flutter.buildFlutterApplication rec {
   };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-Ot96+EF8PgYQmXn0hvIWzN8StuzTgQzakRO3yf7PJAU=";
+  vendorHash = "sha256-dkH+iI1KLsAJtSt6ndc3ZRBllZ9n21RNONqeeUzNQCE=";
 
   desktopItem = makeDesktopItem {
     name = "Fluffychat";
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
index 3261bffda293..80e26e4883ba 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
@@ -152,10 +152,10 @@
     "dependencies": [
       "characters",
       "collection",
-      "js",
       "material_color_utilities",
       "meta",
       "vector_math",
+      "web",
       "sky_engine"
     ]
   },
@@ -166,6 +166,13 @@
     "source": "sdk",
     "dependencies": []
   },
+  {
+    "name": "web",
+    "version": "0.1.4-beta",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "vector_math",
     "version": "2.1.4",
@@ -175,23 +182,16 @@
   },
   {
     "name": "material_color_utilities",
-    "version": "0.2.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "js",
-    "version": "0.6.7",
+    "version": "0.5.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "meta"
+      "collection"
     ]
   },
   {
     "name": "collection",
-    "version": "1.17.1",
+    "version": "1.17.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
@@ -268,7 +268,7 @@
   },
   {
     "name": "source_span",
-    "version": "1.9.1",
+    "version": "1.10.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -417,6 +417,15 @@
       "js"
     ]
   },
+  {
+    "name": "js",
+    "version": "0.6.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta"
+    ]
+  },
   {
     "name": "convert",
     "version": "3.1.1",
@@ -492,7 +501,6 @@
       "collection",
       "fake_async",
       "file",
-      "js",
       "matcher",
       "material_color_utilities",
       "meta",
@@ -504,6 +512,7 @@
       "term_glyph",
       "test_api",
       "vector_math",
+      "web",
       "webdriver"
     ]
   },
@@ -537,7 +546,7 @@
   },
   {
     "name": "matcher",
-    "version": "0.12.15",
+    "version": "0.12.16",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -550,7 +559,7 @@
   },
   {
     "name": "test_api",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -562,8 +571,7 @@
       "stack_trace",
       "stream_channel",
       "string_scanner",
-      "term_glyph",
-      "matcher"
+      "term_glyph"
     ]
   },
   {
@@ -604,7 +612,7 @@
   },
   {
     "name": "vm_service",
-    "version": "11.3.0",
+    "version": "11.7.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -617,6 +625,7 @@
     "dependencies": [
       "flutter",
       "test_api",
+      "matcher",
       "path",
       "fake_async",
       "clock",
@@ -626,14 +635,13 @@
       "boolean_selector",
       "characters",
       "collection",
-      "js",
-      "matcher",
       "material_color_utilities",
       "meta",
       "source_span",
       "stream_channel",
       "string_scanner",
-      "term_glyph"
+      "term_glyph",
+      "web"
     ]
   },
   {
@@ -655,7 +663,6 @@
       "characters",
       "clock",
       "collection",
-      "js",
       "matcher",
       "material_color_utilities",
       "platform",
@@ -667,7 +674,8 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {
@@ -776,12 +784,12 @@
     "source": "sdk",
     "dependencies": [
       "flutter",
-      "js",
       "characters",
       "collection",
       "material_color_utilities",
       "meta",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {
@@ -1983,7 +1991,7 @@
   },
   {
     "name": "intl",
-    "version": "0.18.0",
+    "version": "0.18.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2720,11 +2728,11 @@
       "characters",
       "clock",
       "collection",
-      "js",
       "material_color_utilities",
       "meta",
       "path",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {

From bda14e31e72345c2c18a2e624107b72eb2d8a864 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Mon, 18 Sep 2023 20:48:38 +0200
Subject: [PATCH 12/43] fluffychat: 1.13.0 -> 1.14.1

(cherry picked from commit 2a550d8ccddefcd1d2bbf51e5e29e18f9e15e9a1)
---
 .../instant-messengers/fluffychat/default.nix |   6 +-
 .../instant-messengers/fluffychat/deps.json   | 384 ++++++++----------
 2 files changed, 170 insertions(+), 220 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 66ba7d3ae41e..2e47aa8ab66f 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -14,17 +14,17 @@ let
 in
 flutter.buildFlutterApplication rec {
   pname = "fluffychat";
-  version = "1.13.0";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "krille-chan";
     repo = "fluffychat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc=";
+    hash = "sha256-VTpZvoyZXJ5SCKr3Ocfm4iT6Z/+AWg+SCw/xmp68kMg=";
   };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-dkH+iI1KLsAJtSt6ndc3ZRBllZ9n21RNONqeeUzNQCE=";
+  vendorHash = "sha256-uGrz7QwETZGlwLbfKr1vDo0p/emK1ZCjCX2w0nNVJsA=";
 
   desktopItem = makeDesktopItem {
     name = "Fluffychat";
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
index 80e26e4883ba..b1fd21c10866 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "fluffychat",
-    "version": "1.13.0+3514",
+    "version": "1.14.1+3516",
     "kind": "root",
     "source": "root",
     "dependencies": [
@@ -47,14 +47,13 @@
       "flutter_webrtc",
       "future_loading_dialog",
       "geolocator",
-      "handy_window",
+      "go_router",
       "hive",
       "hive_flutter",
       "http",
       "image_picker",
       "intl",
       "just_audio",
-      "just_audio_mpv",
       "keyboard_shortcuts",
       "latlong2",
       "linkify",
@@ -85,7 +84,6 @@
       "vibration",
       "video_compress",
       "video_player",
-      "vrouter",
       "wakelock",
       "webrtc_interface",
       "dart_code_metrics",
@@ -113,7 +111,7 @@
   },
   {
     "name": "win32",
-    "version": "5.0.5",
+    "version": "5.0.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -122,7 +120,7 @@
   },
   {
     "name": "ffi",
-    "version": "2.0.2",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -227,7 +225,7 @@
   },
   {
     "name": "plugin_platform_interface",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -320,7 +318,7 @@
   },
   {
     "name": "msix",
-    "version": "3.15.0",
+    "version": "3.16.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -397,7 +395,7 @@
   },
   {
     "name": "archive",
-    "version": "3.3.7",
+    "version": "3.3.9",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -730,7 +728,7 @@
   },
   {
     "name": "flutter_native_splash",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -810,7 +808,7 @@
   },
   {
     "name": "dart_code_metrics",
-    "version": "5.7.5",
+    "version": "5.7.6",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -969,7 +967,7 @@
   },
   {
     "name": "webrtc_interface",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
@@ -1012,26 +1010,116 @@
     ]
   },
   {
-    "name": "vrouter",
-    "version": "1.2.1",
+    "name": "video_player",
+    "version": "2.7.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "url_strategy",
-      "url_launcher",
-      "move_to_background"
+      "html",
+      "video_player_android",
+      "video_player_avfoundation",
+      "video_player_platform_interface",
+      "video_player_web"
     ]
   },
   {
-    "name": "move_to_background",
-    "version": "1.0.2",
+    "name": "video_player_web",
+    "version": "2.0.16",
     "kind": "transitive",
     "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "video_player_platform_interface"
+    ]
+  },
+  {
+    "name": "video_player_platform_interface",
+    "version": "6.2.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "video_player_avfoundation",
+    "version": "2.4.9",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "video_player_platform_interface"
+    ]
+  },
+  {
+    "name": "video_player_android",
+    "version": "2.4.9",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "video_player_platform_interface"
+    ]
+  },
+  {
+    "name": "video_compress",
+    "version": "3.1.2",
+    "kind": "direct",
+    "source": "hosted",
     "dependencies": [
       "flutter"
     ]
   },
+  {
+    "name": "vibration",
+    "version": "1.8.1",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "device_info_plus"
+    ]
+  },
+  {
+    "name": "device_info_plus",
+    "version": "9.0.3",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "device_info_plus_platform_interface",
+      "ffi",
+      "file",
+      "flutter",
+      "flutter_web_plugins",
+      "meta",
+      "win32",
+      "win32_registry"
+    ]
+  },
+  {
+    "name": "win32_registry",
+    "version": "1.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "win32"
+    ]
+  },
+  {
+    "name": "device_info_plus_platform_interface",
+    "version": "7.0.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "meta",
+      "plugin_platform_interface"
+    ]
+  },
   {
     "name": "url_launcher",
     "version": "6.1.12",
@@ -1081,7 +1169,7 @@
   },
   {
     "name": "url_launcher_macos",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1111,7 +1199,7 @@
   },
   {
     "name": "url_launcher_android",
-    "version": "6.0.36",
+    "version": "6.0.38",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1119,126 +1207,6 @@
       "url_launcher_platform_interface"
     ]
   },
-  {
-    "name": "url_strategy",
-    "version": "0.2.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter_web_plugins"
-    ]
-  },
-  {
-    "name": "video_player",
-    "version": "2.7.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "html",
-      "video_player_android",
-      "video_player_avfoundation",
-      "video_player_platform_interface",
-      "video_player_web"
-    ]
-  },
-  {
-    "name": "video_player_web",
-    "version": "2.0.16",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "flutter_web_plugins",
-      "video_player_platform_interface"
-    ]
-  },
-  {
-    "name": "video_player_platform_interface",
-    "version": "6.1.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "plugin_platform_interface"
-    ]
-  },
-  {
-    "name": "video_player_avfoundation",
-    "version": "2.4.6",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "video_player_platform_interface"
-    ]
-  },
-  {
-    "name": "video_player_android",
-    "version": "2.4.9",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "video_player_platform_interface"
-    ]
-  },
-  {
-    "name": "video_compress",
-    "version": "3.1.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
-    ]
-  },
-  {
-    "name": "vibration",
-    "version": "1.8.1",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "device_info_plus"
-    ]
-  },
-  {
-    "name": "device_info_plus",
-    "version": "9.0.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "device_info_plus_platform_interface",
-      "ffi",
-      "file",
-      "flutter",
-      "flutter_web_plugins",
-      "meta",
-      "win32",
-      "win32_registry"
-    ]
-  },
-  {
-    "name": "win32_registry",
-    "version": "1.1.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "win32"
-    ]
-  },
-  {
-    "name": "device_info_plus_platform_interface",
-    "version": "7.0.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "meta",
-      "plugin_platform_interface"
-    ]
-  },
   {
     "name": "universal_html",
     "version": "2.2.3",
@@ -1277,7 +1245,7 @@
   },
   {
     "name": "unifiedpush_android",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1337,7 +1305,7 @@
   },
   {
     "name": "path_provider_windows",
-    "version": "2.1.7",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1350,7 +1318,7 @@
   },
   {
     "name": "path_provider_platform_interface",
-    "version": "2.0.6",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1386,7 +1354,7 @@
   },
   {
     "name": "path_provider_linux",
-    "version": "2.1.11",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1399,18 +1367,17 @@
   },
   {
     "name": "xdg_directories",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "meta",
-      "path",
-      "process"
+      "path"
     ]
   },
   {
     "name": "shared_preferences_foundation",
-    "version": "2.3.1",
+    "version": "2.3.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1488,7 +1455,7 @@
   },
   {
     "name": "share_plus",
-    "version": "7.0.2",
+    "version": "7.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1509,7 +1476,7 @@
   },
   {
     "name": "share_plus_platform_interface",
-    "version": "3.2.1",
+    "version": "3.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1524,7 +1491,7 @@
   },
   {
     "name": "path_provider",
-    "version": "2.0.15",
+    "version": "2.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1538,7 +1505,7 @@
   },
   {
     "name": "path_provider_foundation",
-    "version": "2.2.3",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1548,7 +1515,7 @@
   },
   {
     "name": "path_provider_android",
-    "version": "2.0.27",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1726,7 +1693,7 @@
   },
   {
     "name": "permission_handler",
-    "version": "10.4.2",
+    "version": "10.4.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1740,7 +1707,7 @@
   },
   {
     "name": "permission_handler_platform_interface",
-    "version": "3.11.1",
+    "version": "3.11.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1761,7 +1728,7 @@
   },
   {
     "name": "permission_handler_apple",
-    "version": "9.1.3",
+    "version": "9.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1771,7 +1738,7 @@
   },
   {
     "name": "permission_handler_android",
-    "version": "10.3.0",
+    "version": "10.3.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1792,7 +1759,7 @@
   },
   {
     "name": "package_info_plus",
-    "version": "4.0.2",
+    "version": "4.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1857,7 +1824,7 @@
   },
   {
     "name": "matrix",
-    "version": "0.22.2",
+    "version": "0.22.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2028,44 +1995,6 @@
       "flutter"
     ]
   },
-  {
-    "name": "just_audio_mpv",
-    "version": "0.1.6",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "just_audio_platform_interface",
-      "mpv_dart"
-    ]
-  },
-  {
-    "name": "mpv_dart",
-    "version": "0.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "eventify",
-      "path"
-    ]
-  },
-  {
-    "name": "eventify",
-    "version": "1.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "just_audio_platform_interface",
-    "version": "4.2.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "plugin_platform_interface"
-    ]
-  },
   {
     "name": "just_audio",
     "version": "0.9.34",
@@ -2115,9 +2044,19 @@
       "flutter_web_plugins"
     ]
   },
+  {
+    "name": "just_audio_platform_interface",
+    "version": "4.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface"
+    ]
+  },
   {
     "name": "image_picker",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2145,7 +2084,7 @@
   },
   {
     "name": "image_picker_platform_interface",
-    "version": "2.8.0",
+    "version": "2.9.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2192,7 +2131,7 @@
   },
   {
     "name": "file_selector_macos",
-    "version": "0.9.3",
+    "version": "0.9.3+1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2236,7 +2175,7 @@
   },
   {
     "name": "image_picker_for_web",
-    "version": "2.2.0",
+    "version": "3.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2248,7 +2187,7 @@
   },
   {
     "name": "image_picker_android",
-    "version": "0.8.7+3",
+    "version": "0.8.7+4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2279,14 +2218,25 @@
     ]
   },
   {
-    "name": "handy_window",
-    "version": "0.3.1",
+    "name": "go_router",
+    "version": "10.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
-      "flutter"
+      "collection",
+      "flutter",
+      "flutter_web_plugins",
+      "logging",
+      "meta"
     ]
   },
+  {
+    "name": "logging",
+    "version": "1.2.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "geolocator",
     "version": "7.7.1",
@@ -2332,7 +2282,7 @@
   },
   {
     "name": "flutter_webrtc",
-    "version": "0.9.37",
+    "version": "0.9.40",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -2345,7 +2295,7 @@
   },
   {
     "name": "dart_webrtc",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2907,7 +2857,7 @@
   },
   {
     "name": "sqflite",
-    "version": "2.2.8+4",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2918,7 +2868,7 @@
   },
   {
     "name": "sqflite_common",
-    "version": "2.4.5+1",
+    "version": "2.5.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -2963,7 +2913,7 @@
   },
   {
     "name": "file_picker",
-    "version": "5.3.2",
+    "version": "5.3.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3072,7 +3022,7 @@
   },
   {
     "name": "connectivity_plus",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3119,7 +3069,7 @@
   },
   {
     "name": "wakelock_plus",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -3155,7 +3105,7 @@
   },
   {
     "name": "badges",
-    "version": "2.0.3",
+    "version": "3.1.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3173,7 +3123,7 @@
   },
   {
     "name": "adaptive_dialog",
-    "version": "1.9.0-x-macos-beta.1",
+    "version": "1.9.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -3188,7 +3138,7 @@
   },
   {
     "name": "macos_ui",
-    "version": "2.0.0-beta.6",
+    "version": "2.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -3198,7 +3148,7 @@
   },
   {
     "name": "macos_window_utils",
-    "version": "1.1.3",
+    "version": "1.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [

From 57d6b58c31d5afa97e8fb0af2d7ab491c86a4675 Mon Sep 17 00:00:00 2001
From: FlafyDev <flafyarazi@gmail.com>
Date: Mon, 15 May 2023 01:16:47 +0300
Subject: [PATCH 13/43] flutter: Move artifact installation logic to the
 wrapper

(cherry picked from commit b1efbff8ec70f5a6ad564b32f7d5829139bad3be)
---
 .../development/compilers/flutter/default.nix | 18 +++++------
 .../development/compilers/flutter/flutter.nix |  8 +----
 .../development/compilers/flutter/wrapper.nix | 30 +++++++++++++++----
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index b96452d0c89f..0f57919a9508 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -34,15 +34,15 @@ let
         inherit wrapFlutter mkCustomFlutter mkFlutter;
         buildFlutterApplication = callPackage ../../../build-support/flutter {
           # Package a minimal version of Flutter that only uses Linux desktop release artifacts.
-          flutter = wrapFlutter
-            (mkCustomFlutter (args // {
-              includedEngineArtifacts = {
-                common = [ "flutter_patched_sdk_product" ];
-                platform.linux = lib.optionals stdenv.hostPlatform.isLinux
-                  (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
-                    (architecture: [ "release" ]));
-              };
-            }));
+          flutter = (wrapFlutter (mkCustomFlutter args)).override {
+            supportsAndroid = false;
+            includedEngineArtifacts = {
+              common = [ "flutter_patched_sdk_product" ];
+              platform.linux = lib.optionals stdenv.hostPlatform.isLinux
+                (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
+                  (architecture: [ "release" ]));
+            };
+          };
         };
       };
     });
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 71f70acf9da5..3dbab3529e77 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -8,13 +8,7 @@
       "flutter_patched_sdk"
       "flutter_patched_sdk_product"
     ];
-    platform = {
-      android = lib.optionalAttrs stdenv.hostPlatform.isx86_64
-        ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
-      linux = lib.optionals stdenv.hostPlatform.isLinux
-        (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
-          (architecture: [ "debug" "profile" "release" ]));
-    };
+    platform = { };
   }
 
 , lib
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index cac1bcf41d8b..81e5e6e4fdcd 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -2,7 +2,9 @@
 , stdenv
 , callPackage
 , flutter
-, supportsLinuxDesktop ? stdenv.isLinux
+, supportsLinuxDesktop ? stdenv.hostPlatform.isLinux
+, supportsAndroid ? stdenv.hostPlatform.isx86_64
+, includedEngineArtifacts ? null
 , extraPkgConfigPackages ? [ ]
 , extraLibraries ? [ ]
 , extraIncludes ? [ ]
@@ -33,11 +35,27 @@
 }:
 
 let
+  flutterWithArtifacts = flutter.override {
+    includedEngineArtifacts = if includedEngineArtifacts != null then includedEngineArtifacts else {
+      common = [
+        "flutter_patched_sdk"
+        "flutter_patched_sdk_product"
+      ];
+      platform = {
+        android = lib.optionalAttrs supportsAndroid
+          ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
+        linux = lib.optionalAttrs supportsLinuxDesktop
+          (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
+            (architecture: [ "debug" "profile" "release" ]));
+      };
+    };
+  };
+
   # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory.
   # Wrap it to ensure that it does not do that, preferring home directories instead.
   immutableFlutter = writeShellScript "flutter_immutable" ''
     export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
-    ${flutter}/bin/flutter "$@"
+    ${flutterWithArtifacts}/bin/flutter "$@"
   '';
 
   # Tools that the Flutter tool depends on.
@@ -87,12 +105,12 @@ in
 {
   nativeBuildInputs = [ makeWrapper ];
 
-  passthru = flutter.passthru // {
-    inherit (flutter) version;
-    unwrapped = flutter;
+  passthru = flutterWithArtifacts.passthru // {
+    inherit (flutterWithArtifacts) version;
+    unwrapped = flutterWithArtifacts;
   };
 
-  inherit (flutter) meta;
+  inherit (flutterWithArtifacts) meta;
 } ''
   for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do
     addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"

From 9ce1b5ea70edc1830d704ba21bee0519953630f6 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Wed, 14 Jun 2023 19:11:59 +0200
Subject: [PATCH 14/43] flutter: 3.10.0 -> 3.10.5

(cherry picked from commit dcf789f53e4a671c51bd18632ae44d727a03869b)
---
 .../development/compilers/flutter/default.nix |  12 +-
 .../flutter/engine-artifacts/hashes.nix       | 307 +++++++++++-------
 2 files changed, 194 insertions(+), 125 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 0f57919a9508..8b5e36c39ee0 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -53,13 +53,13 @@ in
 {
   inherit wrapFlutter;
   stable = mkFlutter {
-    version = "3.10.0";
-    engineVersion = "d44b5a94c976fbb65815374f61ab5392a220b084";
-    dartVersion = "3.0.0";
-    hash = "sha256-3cRVPNrph9QUUnAdQhd5TOp2i1zFRxJ+OhqxXrJ+ncU=";
+    version = "3.10.5";
+    engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420";
+    dartVersion = "3.0.5";
+    hash = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI=";
     dartHash = {
-      x86_64-linux = "sha256-AhvAt2c0URzL+MSIXlwbkuWNuhKbWvUpoyiYf1vXfcc=";
-      aarch64-linux = "sha256-bo4kZtNpj91JaCW8+GD4bQ60oOWQ7daj4C7cAHwLMtw=";
+      x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28=";
+      aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ=";
     };
     patches = flutter3Patches;
   };
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 5356d5b53519..19f21391ab90 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -1,211 +1,280 @@
 {
-  "d44b5a94c976fbb65815374f61ab5392a220b084" = {
-    "flutter_patched_sdk.zip" = "sha256-uLMzCF3dsBeSZnoY9YQ2bBQhw+hUAksoDKEWr3TCnhk=";
-    "flutter_patched_sdk_product.zip" = "sha256-0NbvAGSK0VgU6jSyboyhviP9H+wID7JoTS6xMqbZs2w=";
-    "android-arm" = {
-      "artifacts.zip" = "sha256-NZde8sVeknhR6bxchb/RURNIlKnJw6j5PZAWmmjiZvM=";
-    };
-    "android-arm-profile" = {
-      "artifacts.zip" = "sha256-BTs1tuSdjVP8zAGCxV+uQ7sAAbCt0dML4g7/85IOFEs=";
-      "linux-x64.zip" = "sha256-GpjP5omeAjHBLZjJQdUMUnPoEgYBLppicLPUTY0fHqM=";
-    };
-    "android-arm-release" = {
-      "artifacts.zip" = "sha256-ip2GnYkKq8aLWjVPk9no3aOf0c3k1h9foznhgLpZ17U=";
-      "linux-x64.zip" = "sha256-mGnmbraE98rqKRdO6keoITOaNCP0K3iYNRadihwOpxc=";
-    };
-    "android-arm64" = {
-      "artifacts.zip" = "sha256-Sl7S/TNZWrlM4Z9UGN5rgGfpKk4UWKz6CKlQbz1qcZ4=";
-    };
-    "android-arm64-profile" = {
-      "artifacts.zip" = "sha256-zNZtTxM8254y+KKSVYlBUYyIV2J04XN1cmnSjkQLJs8=";
-      "linux-x64.zip" = "sha256-M8AbEwFV2zedeqMoNeb+2UbR7i9I9rGh6LXBQcPO4iA=";
-    };
-    "android-arm64-release" = {
-      "artifacts.zip" = "sha256-PdnAIcYccdRs3r6M8rwmgl2x+TsBPMRF/iAEgwLbt/4=";
-      "linux-x64.zip" = "sha256-kmLkKXBj/70B3v5GJ50trTlV8epj16jOlQrh1U4/pVA=";
-    };
-    "android-x86" = {
-      "artifacts.zip" = "sha256-J1kgvNvdWo05HMHJMlVFECLMVnoCqUm1oP4K394w+xc=";
-    };
-    "android-x86-jit-release" = {
-      "artifacts.zip" = "sha256-Tz/veYh/73px0eH0FOXbN4G8fVjXmEHv7G8lRm3YLtY=";
-    };
-    "android-x64" = {
-      "artifacts.zip" = "sha256-+WT7oT31XwE+ykLbiAUvnKw+WVR0VeFXPGpcMUHbsTg=";
-    };
-    "android-x64-profile" = {
-      "artifacts.zip" = "sha256-f298VAJoZ2x+w0bxma7wu5h7Bn6+kCdrHh5qtjhhhhc=";
-      "linux-x64.zip" = "sha256-73Br9XgafwmagxAf61NSHn4BHn4q90pHJYEXCfAG8qY=";
-    };
-    "android-x64-release" = {
-      "artifacts.zip" = "sha256-63hQCvObPmIxTcKyBQlXgGY6FfKp9PrbBY0RkSr1D/U=";
-      "linux-x64.zip" = "sha256-i5WQeePNxUNAbVR06Lz2XCXvZZTJxaFB6txtpVn2h9I=";
-    };
-    "linux-arm64" = {
-      "artifacts.zip" = "sha256-LTdVexuy7cL6dJqdM14YteI7Jo/z5wYOHakbX/BiV38=";
-      "font-subset.zip" = "sha256-cqLjvl3maO6NpN47/e718xyuSL8L8cHqU6ybuwlD+fA=";
-    };
-    "linux-arm64-debug" = {
-      "linux-arm64-flutter-gtk.zip" = "sha256-SRlKQllg5UWHk2kOIQ6ZwbqG5FoeFGCl2F9tTI+XVOE=";
-    };
-    "linux-arm64-profile" = {
-      "linux-arm64-flutter-gtk.zip" = "sha256-4wERBO+eimsSKFt8/P6mQqgzv+HURK+O/YFHAUHpklA=";
-    };
-    "linux-arm64-release" = {
-      "linux-arm64-flutter-gtk.zip" = "sha256-1XHdFiW//1Yd+qOLrRlk0vma99HlGDC/RA0An8db/oY=";
-    };
-    "linux-x64" = {
-      "artifacts.zip" = "sha256-Bl0BRxUfVqNX6y7HdUXu5lIFzMLB2GUJauhOLEeInEE=";
-      "font-subset.zip" = "sha256-v02HV8QOqwdv30RiHpKu8ujTXOQmupGr9HCfpBUvrKM=";
-    };
-    "linux-x64-debug" = {
-      "linux-x64-flutter-gtk.zip" = "sha256-xjScsvWgPO8qeccw5BGzNrMLNzn5O+CvOpoPkvlrX0o=";
-    };
-    "linux-x64-profile" = {
-      "linux-x64-flutter-gtk.zip" = "sha256-52nMjoHQZ/ve7yJW9d8YK02U8mowe9xHZpkTwbGq9vU=";
-    };
-    "linux-x64-release" = {
-      "linux-x64-flutter-gtk.zip" = "sha256-SA7Th1Qasaj4Q5wFr89Rv8PNQx6s6zvHsDxT1EKKZV0=";
-    };
-  };
   "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
-    "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k=";
-    "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA=";
-    "android-arm" = {
+    android-arm = {
       "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";
     };
-    "android-arm-profile" = {
+    android-arm-profile = {
       "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4=";
       "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg=";
     };
-    "android-arm-release" = {
+    android-arm-release = {
       "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho=";
       "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY=";
     };
-    "android-arm64" = {
+    android-arm64 = {
       "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ=";
     };
-    "android-arm64-profile" = {
+    android-arm64-profile = {
       "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0=";
       "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0=";
     };
-    "android-arm64-release" = {
+    android-arm64-release = {
       "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE=";
       "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg=";
     };
-    "android-x86" = {
-      "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y=";
-    };
-    "android-x86-jit-release" = {
-      "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk=";
-    };
-    "android-x64" = {
+    android-x64 = {
       "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q=";
     };
-    "android-x64-profile" = {
+    android-x64-profile = {
       "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM=";
       "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs=";
     };
-    "android-x64-release" = {
+    android-x64-release = {
       "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY=";
       "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U=";
     };
-    "linux-arm64" = {
+    android-x86 = {
+      "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y=";
+    };
+    android-x86-jit-release = {
+      "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk=";
+    };
+    "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k=";
+    "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA=";
+    linux-arm64 = {
       "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw=";
       "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU=";
     };
-    "linux-arm64-debug" = {
+    linux-arm64-debug = {
       "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg=";
     };
-    "linux-arm64-profile" = {
+    linux-arm64-profile = {
       "linux-arm64-flutter-gtk.zip" = "sha256-xB0eqrBYD7vhOwYUgJwNaBftNZJgdwxA9AUpEfX0iFs=";
     };
-    "linux-arm64-release" = {
+    linux-arm64-release = {
       "linux-arm64-flutter-gtk.zip" = "sha256-aHLKV129WIRsLUG6xTMwCKB4eXD3jonqinjI8KSsOus=";
     };
-    "linux-x64" = {
+    linux-x64 = {
       "artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8=";
       "font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY=";
     };
-    "linux-x64-debug" = {
+    linux-x64-debug = {
       "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M=";
     };
-    "linux-x64-profile" = {
+    linux-x64-profile = {
       "linux-x64-flutter-gtk.zip" = "sha256-AnkLMPW3mwiXdiDz3Zo802QZRi+8EMCy4Mx2ODSbMOU=";
     };
-    "linux-x64-release" = {
+    linux-x64-release = {
       "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY=";
     };
   };
+  "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = {
+    android-arm = {
+      "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU=";
+    };
+    android-arm-profile = {
+      "artifacts.zip" = "sha256-MZK1zaSv9yuZaVDR1dReCM7WRDxKql0yxsPa8WFc1yw=";
+      "linux-x64.zip" = "sha256-9OlBv2C6Msj73g624TixbstudCTbdIJ6PzPMsbQENy4=";
+    };
+    android-arm-release = {
+      "artifacts.zip" = "sha256-tjHckwoxQkkKoyTl6+wBKK40mFDmSDvCPNhBHVA+xxw=";
+      "linux-x64.zip" = "sha256-zE9oYkv4WBcbgEdYfYIcdDXX3tnYfCg+3KA3oA03nYA=";
+    };
+    android-arm64 = {
+      "artifacts.zip" = "sha256-8W/JrOGhAzHWpM2Jh9vjdkaB6ODmCItqcmF47GqbNQk=";
+    };
+    android-arm64-profile = {
+      "artifacts.zip" = "sha256-9SGBWp05lxLQTpLuzq8FYSQQOpjo8UL93Pv4YYFD4QE=";
+      "linux-x64.zip" = "sha256-5nH2AAxupRIhn8gNH+1V+vSP+qqfx5MS97EC4s3QHe8=";
+    };
+    android-arm64-release = {
+      "artifacts.zip" = "sha256-7O7RBfEo6enZtVNsnt4HH0bex8Xpz9mqCvb2LNLbg3Q=";
+      "linux-x64.zip" = "sha256-loucmX4+0R11L1nzewiMTeRZoB6wLK0WasW5W3rIvYU=";
+    };
+    android-x64 = {
+      "artifacts.zip" = "sha256-j7AezbyzH07yOR0/W1ttfCjMHMdOlXLQjAsu/ExqmqA=";
+    };
+    android-x64-profile = {
+      "artifacts.zip" = "sha256-J8cqdcHoj1hpo6zY5R6S9lvkVXp7wvzQlurM7TEUe+k=";
+      "linux-x64.zip" = "sha256-YuRHctkDjLZVGQr+m5uM+AxYNLkfqycV4UNcAp7JavE=";
+    };
+    android-x64-release = {
+      "artifacts.zip" = "sha256-uhq3fXcxXjF4/YHSkf6V4wToL9jOUKBm3978j/7xI/s=";
+      "linux-x64.zip" = "sha256-iJfatLW7jVcrfNdVx/QOPiyON5ce0tSNGOBx0TILrKE=";
+    };
+    android-x86 = {
+      "artifacts.zip" = "sha256-/xLacCi65hg1gEahty0btrc+NR/jfebSAIt31qwIlZY=";
+    };
+    android-x86-jit-release = {
+      "artifacts.zip" = "sha256-Ntq0i+sFruDhlyp9VBxBnsNqqGoQeXMeIwfi+BNlr0Q=";
+    };
+    "flutter_patched_sdk.zip" = "sha256-kRRFCqQGBDimqwMiSn4yRMNRfZHt03YJqsKW47IBIvQ=";
+    "flutter_patched_sdk_product.zip" = "sha256-BowamIQHPZgfcZbWG7OFrB5GeEwdcA7AdUrF2Y+KIds=";
+    linux-arm64 = {
+      "artifacts.zip" = "sha256-jME3ivE+M+ceAt3aGPSeVwPaW8UhwGQOoL5lmRUqrOU=";
+      "font-subset.zip" = "sha256-MqavBMXOlx5JX94Oe/8GGuuDNh7A2UkjiOrEhCDW5cc=";
+    };
+    linux-arm64-debug = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-+ojrvr3bpCAwBc5ZJxSSvfxpW9M8h+YeQqdKno9TJgI=";
+    };
+    linux-arm64-profile = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-5Smyc7JvudBG16l4Twq8QrZgfYXXeUGXb9NRNCBE+D4=";
+    };
+    linux-arm64-release = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-WWHhfgD83eMkAYC1jlZdkqO2J8lxf0VlIBGB8qfXQp0=";
+    };
+    linux-x64 = {
+      "artifacts.zip" = "sha256-LpCjbAjQQmDL3r5iKHkB1072qKbIkvVusPvMYCj1ZI4=";
+      "font-subset.zip" = "sha256-2TWRwNIMSomFb+ZDKN6ZF9egehq0SBkcyD+0g+GvmEM=";
+    };
+    linux-x64-debug = {
+      "linux-x64-flutter-gtk.zip" = "sha256-BV+Sp1EUTndrlu93eQB5txa/lsUPEEk42TbImFGzmk8=";
+    };
+    linux-x64-profile = {
+      "linux-x64-flutter-gtk.zip" = "sha256-HhT2wm2dqc2ZoPprzm2TTP6pG/glh4ugmmowUYNtBRo=";
+    };
+    linux-x64-release = {
+      "linux-x64-flutter-gtk.zip" = "sha256-eluXkoISuzObXt2aiBmZGW6x8MsPTiD9bbVM4xcpe2w=";
+    };
+  };
   "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab" = {
-    "flutter_patched_sdk.zip" = "sha256-A/y5Y+Aw0CUhXABbdyQcGCSnSbO7Ask+71m8LZDSjH4=";
-    "flutter_patched_sdk_product.zip" = "sha256-VPxF4NrTUhFbpztyPnLEiC9Cy0kDDbYvy21kA5ES4HM=";
-    "android-arm" = {
+    android-arm = {
       "artifacts.zip" = "sha256-3igOO+rgFh0fNTIIiiucqSmqC+NKFPG5H1CnIa9bDcM=";
     };
-    "android-arm-profile" = {
+    android-arm-profile = {
       "artifacts.zip" = "sha256-qai254LNrQXJBsaoQgXao6mBpzzcYHh4sUESurSyxNA=";
       "linux-x64.zip" = "sha256-hBkntf1fX5w752ly6lVUHm6wEM/4ep9guJGma3SKjxU=";
     };
-    "android-arm-release" = {
+    android-arm-release = {
       "artifacts.zip" = "sha256-7yuXIJyErb1PZyk56+TtlJY0o1EOwmdAvpVfGGAteuA=";
       "linux-x64.zip" = "sha256-v/jBnE662XOX/fOhYbve7ZiQwVu0haIMOD532Vdj9Yw=";
     };
-    "android-arm64" = {
+    android-arm64 = {
       "artifacts.zip" = "sha256-Llxu8+SkYEtnoiMf01rffPpF/AjrlV+QPuAW850oMzo=";
     };
-    "android-arm64-profile" = {
+    android-arm64-profile = {
       "artifacts.zip" = "sha256-su4U80supv8Q+2kE/5FTybiA5NFbKNMHqdB0NHCqrVI=";
       "linux-x64.zip" = "sha256-yGt0SztNxYHDwZ1DwzLg5REE8rmMRKNn7GfCQ+GEHBw=";
     };
-    "android-arm64-release" = {
+    android-arm64-release = {
       "artifacts.zip" = "sha256-+p1+SXSEglR3jqWc/jKgmtR9nOGgMRGC+anoTs1kRc8=";
       "linux-x64.zip" = "sha256-5UiG5gxOso8NO+7nkb6bjxW8e/Tr7mlvPRUagSRTCNs=";
     };
-    "android-x86" = {
-      "artifacts.zip" = "sha256-Cbo17VYWaclyO1RLHkwjbqoFVZ283IgGdN0uDdiWvQs=";
-    };
-    "android-x86-jit-release" = {
-      "artifacts.zip" = "sha256-gSPm2tClTj2vEYtGKgobD/mebWLNlDp8nEoFX0rhEOk=";
-    };
-    "android-x64" = {
+    android-x64 = {
       "artifacts.zip" = "sha256-PVb1aKMMTlDT41O2MZRAUjCq8h+m/s2h5qOnEFPd77w=";
     };
-    "android-x64-profile" = {
+    android-x64-profile = {
       "artifacts.zip" = "sha256-gZSSRCDy42AMLMiu/KH7YsDuFVaxRcoyXzUgV8V025Y=";
       "linux-x64.zip" = "sha256-9+LCjeI18u/GlPDMIl6Jx6b++lc90fJ5tVBlDR+ctDs=";
     };
-    "android-x64-release" = {
+    android-x64-release = {
       "artifacts.zip" = "sha256-rsS08VP86/b2S0TEYusCEJBvS4BuevsmV9REAxRgJIc=";
       "linux-x64.zip" = "sha256-H4nFCJ+iCUzIwHogYzS+h33eDMaFnz71dcDLSQW1aPg=";
     };
-    "linux-arm64" = {
+    android-x86 = {
+      "artifacts.zip" = "sha256-Cbo17VYWaclyO1RLHkwjbqoFVZ283IgGdN0uDdiWvQs=";
+    };
+    android-x86-jit-release = {
+      "artifacts.zip" = "sha256-gSPm2tClTj2vEYtGKgobD/mebWLNlDp8nEoFX0rhEOk=";
+    };
+    "flutter_patched_sdk.zip" = "sha256-A/y5Y+Aw0CUhXABbdyQcGCSnSbO7Ask+71m8LZDSjH4=";
+    "flutter_patched_sdk_product.zip" = "sha256-VPxF4NrTUhFbpztyPnLEiC9Cy0kDDbYvy21kA5ES4HM=";
+    linux-arm64 = {
       "artifacts.zip" = "sha256-kCxsKQQQX6wzhD46bfoflKdz3AYYkoSyavhfyTDuHLU=";
       "font-subset.zip" = "sha256-Yk6JsNWe7ftEQU/TsjDUZSFeLzeIbcS63lhl8fsWsdk=";
       "linux-arm64-flutter-gtk.zip" = "sha256-girVdkXrTO5tssoi+eKwG9ykstCR/VOx8zWtcAz8AKM=";
     };
-    "linux-arm64-debug" = {
+    linux-arm64-debug = {
       "linux-arm64-flutter-gtk.zip" = "sha256-girVdkXrTO5tssoi+eKwG9ykstCR/VOx8zWtcAz8AKM=";
     };
-    "linux-arm64-profile" = {
+    linux-arm64-profile = {
       "linux-arm64-flutter-gtk.zip" = "sha256-VL5cwYaZ1FOJ3TwJzbgvHDQwkU9NrHGnf/tQhZ/dAGg=";
     };
-    "linux-arm64-release" = {
+    linux-arm64-release = {
       "linux-arm64-flutter-gtk.zip" = "sha256-27hy7mLFCLkqJbn+5p5eJdYnfBKTyfFe98iUMmKyz4g=";
     };
-    "linux-x64" = {
+    linux-x64 = {
       "artifacts.zip" = "sha256-JgEX+rKxdcWBBaxyR42eC7qOAvaawF9M2+rfaD4IgeA=";
       "font-subset.zip" = "sha256-5EoxBrxSjaLLd+rKrxVYNoUZaejk0qcQ5LVsmqtKc2g=";
       "linux-x64-flutter-gtk.zip" = "sha256-MH5HDPoXXi/KpQLQ0U1tQzZ0sbZx1RVhZtQ7L+WhZgk=";
     };
-    "linux-x64-debug" = {
+    linux-x64-debug = {
       "linux-x64-flutter-gtk.zip" = "sha256-MH5HDPoXXi/KpQLQ0U1tQzZ0sbZx1RVhZtQ7L+WhZgk=";
     };
-    "linux-x64-profile" = {
+    linux-x64-profile = {
       "linux-x64-flutter-gtk.zip" = "sha256-r2hB/AKrB5vNga2fve4tTM4j+Zp9KDqNlTjKQhQvbaI=";
     };
-    "linux-x64-release" = {
+    linux-x64-release = {
       "linux-x64-flutter-gtk.zip" = "sha256-muREs2iUiHCZM+SGN5q3HRRGnejJapKN582Aeog49MI=";
     };
   };
+  d44b5a94c976fbb65815374f61ab5392a220b084 = {
+    android-arm = {
+      "artifacts.zip" = "sha256-NZde8sVeknhR6bxchb/RURNIlKnJw6j5PZAWmmjiZvM=";
+    };
+    android-arm-profile = {
+      "artifacts.zip" = "sha256-BTs1tuSdjVP8zAGCxV+uQ7sAAbCt0dML4g7/85IOFEs=";
+      "linux-x64.zip" = "sha256-GpjP5omeAjHBLZjJQdUMUnPoEgYBLppicLPUTY0fHqM=";
+    };
+    android-arm-release = {
+      "artifacts.zip" = "sha256-ip2GnYkKq8aLWjVPk9no3aOf0c3k1h9foznhgLpZ17U=";
+      "linux-x64.zip" = "sha256-mGnmbraE98rqKRdO6keoITOaNCP0K3iYNRadihwOpxc=";
+    };
+    android-arm64 = {
+      "artifacts.zip" = "sha256-Sl7S/TNZWrlM4Z9UGN5rgGfpKk4UWKz6CKlQbz1qcZ4=";
+    };
+    android-arm64-profile = {
+      "artifacts.zip" = "sha256-zNZtTxM8254y+KKSVYlBUYyIV2J04XN1cmnSjkQLJs8=";
+      "linux-x64.zip" = "sha256-M8AbEwFV2zedeqMoNeb+2UbR7i9I9rGh6LXBQcPO4iA=";
+    };
+    android-arm64-release = {
+      "artifacts.zip" = "sha256-PdnAIcYccdRs3r6M8rwmgl2x+TsBPMRF/iAEgwLbt/4=";
+      "linux-x64.zip" = "sha256-kmLkKXBj/70B3v5GJ50trTlV8epj16jOlQrh1U4/pVA=";
+    };
+    android-x64 = {
+      "artifacts.zip" = "sha256-+WT7oT31XwE+ykLbiAUvnKw+WVR0VeFXPGpcMUHbsTg=";
+    };
+    android-x64-profile = {
+      "artifacts.zip" = "sha256-f298VAJoZ2x+w0bxma7wu5h7Bn6+kCdrHh5qtjhhhhc=";
+      "linux-x64.zip" = "sha256-73Br9XgafwmagxAf61NSHn4BHn4q90pHJYEXCfAG8qY=";
+    };
+    android-x64-release = {
+      "artifacts.zip" = "sha256-63hQCvObPmIxTcKyBQlXgGY6FfKp9PrbBY0RkSr1D/U=";
+      "linux-x64.zip" = "sha256-i5WQeePNxUNAbVR06Lz2XCXvZZTJxaFB6txtpVn2h9I=";
+    };
+    android-x86 = {
+      "artifacts.zip" = "sha256-J1kgvNvdWo05HMHJMlVFECLMVnoCqUm1oP4K394w+xc=";
+    };
+    android-x86-jit-release = {
+      "artifacts.zip" = "sha256-Tz/veYh/73px0eH0FOXbN4G8fVjXmEHv7G8lRm3YLtY=";
+    };
+    "flutter_patched_sdk.zip" = "sha256-uLMzCF3dsBeSZnoY9YQ2bBQhw+hUAksoDKEWr3TCnhk=";
+    "flutter_patched_sdk_product.zip" = "sha256-0NbvAGSK0VgU6jSyboyhviP9H+wID7JoTS6xMqbZs2w=";
+    linux-arm64 = {
+      "artifacts.zip" = "sha256-LTdVexuy7cL6dJqdM14YteI7Jo/z5wYOHakbX/BiV38=";
+      "font-subset.zip" = "sha256-cqLjvl3maO6NpN47/e718xyuSL8L8cHqU6ybuwlD+fA=";
+    };
+    linux-arm64-debug = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-SRlKQllg5UWHk2kOIQ6ZwbqG5FoeFGCl2F9tTI+XVOE=";
+    };
+    linux-arm64-profile = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-4wERBO+eimsSKFt8/P6mQqgzv+HURK+O/YFHAUHpklA=";
+    };
+    linux-arm64-release = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-1XHdFiW//1Yd+qOLrRlk0vma99HlGDC/RA0An8db/oY=";
+    };
+    linux-x64 = {
+      "artifacts.zip" = "sha256-Bl0BRxUfVqNX6y7HdUXu5lIFzMLB2GUJauhOLEeInEE=";
+      "font-subset.zip" = "sha256-v02HV8QOqwdv30RiHpKu8ujTXOQmupGr9HCfpBUvrKM=";
+    };
+    linux-x64-debug = {
+      "linux-x64-flutter-gtk.zip" = "sha256-xjScsvWgPO8qeccw5BGzNrMLNzn5O+CvOpoPkvlrX0o=";
+    };
+    linux-x64-profile = {
+      "linux-x64-flutter-gtk.zip" = "sha256-52nMjoHQZ/ve7yJW9d8YK02U8mowe9xHZpkTwbGq9vU=";
+    };
+    linux-x64-release = {
+      "linux-x64-flutter-gtk.zip" = "sha256-SA7Th1Qasaj4Q5wFr89Rv8PNQx6s6zvHsDxT1EKKZV0=";
+    };
+  };
 }

From efa0d10f0796f3b95844e55b7c07db8c95095ef2 Mon Sep 17 00:00:00 2001
From: FlafyDev <flafyarazi@gmail.com>
Date: Fri, 30 Jun 2023 15:00:56 +0300
Subject: [PATCH 15/43] flutter: Separate cache and unwrapped derivations

flutter-unwrapped will now not come with engine artifacts in its cache directory(`$out/bin/cache`).

To specify a different cache directory, set FLUTTER_CACHE_DIR.

Flutter's wrapper now sets FLUTTER_CACHE_DIR to set engine artifacts.

The sh file `$out/bin/internal/shared.sh` runs when launching Flutter and calls `"$FLUTTER_ROOT/bin/cache/` instead of our environment variable `FLUTTER_CACHE_DIR`.
I decided not to patch it since the script doesn't require engine artifacts(which are the only thing not added by the unwrapped derivation), so it shouldn't fail, and patching it will just be harder to maintain.

(cherry picked from commit 570f3efd1d447597fd1d468188d785dfe1207b44)
---
 .../development/compilers/flutter/flutter.nix | 58 +----------
 .../flutter/patches/flutter3/move-cache.patch | 16 ++++
 .../development/compilers/flutter/wrapper.nix | 95 +++++++++++++++----
 3 files changed, 92 insertions(+), 77 deletions(-)

diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 3dbab3529e77..59492f81231c 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -3,68 +3,13 @@
 , patches
 , dart
 , src
-, includedEngineArtifacts ? {
-    common = [
-      "flutter_patched_sdk"
-      "flutter_patched_sdk_product"
-    ];
-    platform = { };
-  }
-
 , lib
-, callPackage
 , stdenv
-, runCommandLocal
-, symlinkJoin
-, lndir
 , git
 , which
 }:
 
 let
-  engineArtifactDirectory =
-    let
-      engineArtifacts = callPackage ./engine-artifacts { inherit engineVersion; };
-    in
-    runCommandLocal "flutter-engine-artifacts-${version}" { }
-      (
-        let
-          mkCommonArtifactLinkCommand = { artifact }:
-            ''
-              mkdir -p $out/common
-              ${lndir}/bin/lndir -silent ${artifact} $out/common
-            '';
-          mkPlatformArtifactLinkCommand = { artifact, os, architecture, variant ? null }:
-            let
-              artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}";
-            in
-            ''
-              mkdir -p $out/${artifactDirectory}
-                ${lndir}/bin/lndir -silent ${artifact} $out/${artifactDirectory}
-            '';
-        in
-        ''
-          ${
-            builtins.concatStringsSep "\n"
-              ((map (name: mkCommonArtifactLinkCommand {
-                artifact = engineArtifacts.common.${name};
-              }) (if includedEngineArtifacts ? common then includedEngineArtifacts.common else [ ])) ++
-              (builtins.foldl' (commands: os: commands ++
-                (builtins.foldl' (commands: architecture: commands ++
-                  (builtins.foldl' (commands: variant: commands ++
-                    (map (artifact: mkPlatformArtifactLinkCommand {
-                      inherit artifact os architecture variant;
-                    }) engineArtifacts.platform.${os}.${architecture}.variants.${variant}))
-                  (map (artifact: mkPlatformArtifactLinkCommand {
-                    inherit artifact os architecture;
-                  }) engineArtifacts.platform.${os}.${architecture}.base)
-                  includedEngineArtifacts.platform.${os}.${architecture}))
-                [] (builtins.attrNames includedEngineArtifacts.platform.${os})))
-              [] (builtins.attrNames (if includedEngineArtifacts ? platform then includedEngineArtifacts.platform else { }))))
-          }
-        ''
-      );
-
   unwrapped =
     stdenv.mkDerivation {
       name = "flutter-${version}-unwrapped";
@@ -134,7 +79,6 @@ let
         mkdir -p $out
         cp -r . $out
         ln -sf ${dart} $out/bin/cache/dart-sdk
-        ln -sf ${engineArtifactDirectory} $out/bin/cache/artifacts/engine
 
         runHook postInstall
       '';
@@ -153,7 +97,7 @@ let
       '';
 
       passthru = {
-        inherit dart;
+        inherit dart engineVersion;
         # The derivation containing the original Flutter SDK files.
         # When other derivations wrap this one, any unmodified files
         # found here should be included as-is, for tooling compatibility.
diff --git a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
index efab81d2fc0e..cc6e5e8f49e0 100644
--- a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
@@ -35,3 +35,19 @@ index dd80b1e46e..8e54517765 100644
        if (!devToolsDir.existsSync()) {
          throw Exception('Could not find directory at ${devToolsDir.path}');
        }
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+index 1c31c1b5db..76c7210d3b 100644
+--- a/packages/flutter_tools/lib/src/cache.dart
++++ b/packages/flutter_tools/lib/src/cache.dart
+@@ -529,6 +529,11 @@ class Cache {
+ 
+   /// Return the top-level directory in the cache; this is `bin/cache`.
+   Directory getRoot() {
++    const Platform platform = LocalPlatform();
++    if (platform.environment.containsKey('FLUTTER_CACHE_DIR')) {
++      return _fileSystem.directory(platform.environment['FLUTTER_CACHE_DIR']);
++    }
++
+     if (_rootOverride != null) {
+       return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
+     } else {
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 81e5e6e4fdcd..50c522fd0e04 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -4,7 +4,19 @@
 , flutter
 , supportsLinuxDesktop ? stdenv.hostPlatform.isLinux
 , supportsAndroid ? stdenv.hostPlatform.isx86_64
-, includedEngineArtifacts ? null
+, includedEngineArtifacts ? {
+    common = [
+      "flutter_patched_sdk"
+      "flutter_patched_sdk_product"
+    ];
+    platform = {
+      android = lib.optionalAttrs supportsAndroid
+        ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
+      linux = lib.optionalAttrs supportsLinuxDesktop
+        (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
+          (architecture: [ "debug" "profile" "release" ]));
+    };
+  }
 , extraPkgConfigPackages ? [ ]
 , extraLibraries ? [ ]
 , extraIncludes ? [ ]
@@ -32,30 +44,73 @@
 , cmake
 , ninja
 , clang
+, lndir
+, symlinkJoin
 }:
 
 let
-  flutterWithArtifacts = flutter.override {
-    includedEngineArtifacts = if includedEngineArtifacts != null then includedEngineArtifacts else {
-      common = [
-        "flutter_patched_sdk"
-        "flutter_patched_sdk_product"
-      ];
-      platform = {
-        android = lib.optionalAttrs supportsAndroid
-          ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
-        linux = lib.optionalAttrs supportsLinuxDesktop
-          (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
-            (architecture: [ "debug" "profile" "release" ]));
-      };
-    };
+  engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; };
+  mkCommonArtifactLinkCommand = { artifact }:
+    ''
+      mkdir -p $out/artifacts/engine/common
+      lndir -silent ${artifact} $out/artifacts/engine/common
+    '';
+  mkPlatformArtifactLinkCommand = { artifact, os, architecture, variant ? null }:
+    let
+      artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}";
+    in
+    ''
+      mkdir -p $out/artifacts/engine/${artifactDirectory}
+      lndir -silent ${artifact} $out/artifacts/engine/${artifactDirectory}
+    '';
+  engineArtifactDirectory =
+    runCommandLocal "flutter-engine-artifacts-${flutter.version}" { nativeBuildInputs = [ lndir ]; }
+      (
+        builtins.concatStringsSep "\n"
+          ((map
+            (name: mkCommonArtifactLinkCommand {
+              artifact = engineArtifacts.common.${name};
+            })
+            (includedEngineArtifacts.common or [ ])) ++
+          (builtins.foldl'
+            (commands: os: commands ++
+              (builtins.foldl'
+                (commands: architecture: commands ++
+                  (builtins.foldl'
+                    (commands: variant: commands ++
+                      (map
+                        (artifact: mkPlatformArtifactLinkCommand {
+                          inherit artifact os architecture variant;
+                        })
+                        engineArtifacts.platform.${os}.${architecture}.variants.${variant}))
+                    (map
+                      (artifact: mkPlatformArtifactLinkCommand {
+                        inherit artifact os architecture;
+                      })
+                      engineArtifacts.platform.${os}.${architecture}.base)
+                    includedEngineArtifacts.platform.${os}.${architecture}))
+                [ ]
+                (builtins.attrNames includedEngineArtifacts.platform.${os})))
+            [ ]
+            (builtins.attrNames (includedEngineArtifacts.platform or { }))))
+      );
+
+  cacheDir = symlinkJoin {
+    name = "flutter-cache-dir";
+    paths = [
+      engineArtifactDirectory
+      "${flutter}/bin/cache"
+    ];
   };
 
   # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory.
   # Wrap it to ensure that it does not do that, preferring home directories instead.
+  # The sh file `$out/bin/internal/shared.sh` runs when launching Flutter and calls `"$FLUTTER_ROOT/bin/cache/` instead of our environment variable `FLUTTER_CACHE_DIR`.
+  # We do not patch it since the script doesn't require engine artifacts(which are the only thing not added by the unwrapped derivation), so it shouldn't fail, and patching it will just be harder to maintain.
   immutableFlutter = writeShellScript "flutter_immutable" ''
     export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
-    ${flutterWithArtifacts}/bin/flutter "$@"
+    export FLUTTER_CACHE_DIR=${cacheDir}
+    ${flutter}/bin/flutter "$@"
   '';
 
   # Tools that the Flutter tool depends on.
@@ -105,12 +160,12 @@ in
 {
   nativeBuildInputs = [ makeWrapper ];
 
-  passthru = flutterWithArtifacts.passthru // {
-    inherit (flutterWithArtifacts) version;
-    unwrapped = flutterWithArtifacts;
+  passthru = flutter.passthru // {
+    inherit (flutter) version;
+    unwrapped = flutter;
   };
 
-  inherit (flutterWithArtifacts) meta;
+  inherit (flutter) meta;
 } ''
   for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do
     addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"

From 03e12d1c86caab8d415f37308dd42d90dc208785 Mon Sep 17 00:00:00 2001
From: Sunghoon Kang <me@hoon.dev>
Date: Wed, 5 Jul 2023 17:25:32 +0900
Subject: [PATCH 16/43] flutter: add darwin support

Signed-off-by: Sunghoon Kang <me@hoon.dev>
(cherry picked from commit 77702747e7f227e1c7e5658a4259eed1a9580dea)
---
 .../development/compilers/flutter/default.nix | 50 +++++++++--
 .../flutter/engine-artifacts/default.nix      | 83 ++++++++++++++---
 .../flutter/engine-artifacts/hashes.nix       | 88 +++++++++++++++++++
 .../development/compilers/flutter/flutter.nix | 12 ++-
 .../flutter/patches/flutter3/move-cache.patch |  6 +-
 .../development/compilers/flutter/wrapper.nix | 13 ++-
 6 files changed, 226 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 8b5e36c39ee0..04a8d874bf86 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -5,7 +5,7 @@ let
   getPatches = dir:
     let files = builtins.attrNames (builtins.readDir dir);
     in map (f: dir + ("/" + f)) files;
-  mkFlutter = { version, engineVersion, dartVersion, hash, dartHash, patches }:
+  mkFlutter = { version, engineVersion, dartVersion, flutterHash, dartHash, patches }:
     let
       args = {
         inherit version engineVersion patches;
@@ -21,12 +21,34 @@ let
               url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
               sha256 = dartHash.aarch64-linux;
             };
+            "${dartVersion}-x86_64-darwin" = fetchzip {
+              url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
+              sha256 = dartHash.x86_64-darwin;
+            };
+            "${dartVersion}-aarch64-darwin" = fetchzip {
+              url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
+              sha256 = dartHash.aarch64-darwin;
+            };
           };
         };
-        src = fetchzip {
-          url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
-          sha256 = hash;
-        };
+        src = {
+          x86_64-linux = fetchzip {
+            url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
+            sha256 = flutterHash.x86_64-linux;
+          };
+          aarch64-linux = fetchzip {
+            url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
+            sha256 = flutterHash.aarch64-linux;
+          };
+          x86_64-darwin = fetchzip {
+            url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${version}-stable.zip";
+            sha256 = flutterHash.x86_64-darwin;
+          };
+          aarch64-darwin = fetchzip {
+            url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_${version}-stable.zip";
+            sha256 = flutterHash.aarch64-darwin;
+          };
+        }.${stdenv.hostPlatform.system};
       };
     in
     (mkCustomFlutter args).overrideAttrs (prev: next: {
@@ -56,10 +78,17 @@ in
     version = "3.10.5";
     engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420";
     dartVersion = "3.0.5";
-    hash = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI=";
     dartHash = {
       x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28=";
       aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ=";
+      x86_64-darwin = "sha256-4gJ659bNzs2lfI1LRwFACgu/ttkj+3xIrqLijju+CaI=";
+      aarch64-darwin = "sha256-RJt+muq5IrcAhVLYEgdbVygcY1oB7tnVCN+iqktC+6c=";
+    };
+    flutterHash = rec {
+      x86_64-linux = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI=";
+      aarch64-linux = x86_64-linux;
+      x86_64-darwin = "sha256-1ZC5aCoGVBCeTSsu/ZEl1v53lLnzulx8Ya6YXvo4yIY=";
+      aarch64-darwin = "sha256-TCMempLjO47IbP5MAZVHlXXvNaURGo+EbaL0K8e27wU=";
     };
     patches = flutter3Patches;
   };
@@ -68,10 +97,17 @@ in
     version = "3.7.12";
     engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314";
     dartVersion = "2.19.6";
-    hash = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE=";
     dartHash = {
       x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo=";
       aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck=";
+      x86_64-darwin = "sha256-tuIQhIOX2ub0u99CW/l7nCya9YVNokCZNgbVFqO4ils=";
+      aarch64-darwin = "sha256-Oe8/0ygDN3xf5/2I3N/OBzF0bps7Mg0K2zJKj+E9Nak=";
+    };
+    flutterHash = rec {
+      x86_64-linux = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE=";
+      aarch64-linux = x86_64-linux;
+      x86_64-darwin = "sha256-cJF8KB9fNb3hTZShDAPsMmr1neRdIMLvIl/m2tpzwQs=";
+      aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4=";
     };
     patches = flutter3Patches;
   };
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
index 6f5d6b98d9b8..32533d277bc2 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
@@ -2,10 +2,11 @@
 , stdenv
 , hostPlatform
 , engineVersion
+, fetchurl
 , fetchzip
 , autoPatchelfHook
-
 , gtk3
+, unzip
 }:
 
 let
@@ -44,6 +45,56 @@ let
             };
           };
 
+        darwin = {
+          "arm64" = {
+            base = [
+              { archive = "artifacts.zip"; }
+              { archive = "font-subset.zip"; }
+            ];
+            variants = lib.genAttrs [ "profile" "release" ]
+              (variant: [
+                { archive = "artifacts.zip"; }
+              ]);
+          };
+          "x64" = {
+            base = [
+              { archive = "FlutterEmbedder.framework.zip"; }
+              { archive = "FlutterMacOS.framework.zip"; }
+              { archive = "artifacts.zip"; }
+              { archive = "font-subset.zip"; }
+              { archive = "gen_snapshot.zip"; }
+            ];
+            variants.profile = [
+              { archive = "FlutterMacOS.framework.zip"; }
+              { archive = "artifacts.zip"; }
+              { archive = "gen_snapshot.zip"; }
+            ];
+            variants.release = [
+              { archive = "FlutterMacOS.dSYM.zip"; }
+              { archive = "FlutterMacOS.framework.zip"; }
+              { archive = "artifacts.zip"; }
+              { archive = "gen_snapshot.zip"; }
+            ];
+          };
+        };
+
+        ios =
+          (lib.genAttrs
+            [ "" ]
+            (arch:
+              {
+                base = [
+                  { archive = "artifacts.zip"; }
+                ];
+                variants.profile = [
+                  { archive = "artifacts.zip"; }
+                ];
+                variants.release = [
+                  { archive = "artifacts.zip"; }
+                  { archive = "Flutter.dSYM.zip"; }
+                ];
+              }));
+
         linux = lib.genAttrs
           [ "arm64" "x64" ]
           (arch:
@@ -84,19 +135,31 @@ let
   mkArtifactDerivation = { platform ? null, variant ? null, subdirectory ? null, archive, ... }@args:
     let
       artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}";
-      archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive;
+      archiveExtension = ".${(lib.last (lib.splitString "." archive))}";
+      archiveBasename = lib.removeSuffix archiveExtension archive;
+      overrideUnpackCmd = builtins.elem archive [ "FlutterEmbedder.framework.zip" "FlutterMacOS.framework.zip" ];
     in
     stdenv.mkDerivation ({
       pname = "flutter-artifact${lib.optionalString (platform != null) "-${artifactDirectory}"}-${archiveBasename}";
       version = engineVersion;
 
-      src = fetchzip {
-        url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}";
-        stripRoot = false;
-        hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive};
-      };
+      nativeBuildInputs = [ unzip ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-      nativeBuildInputs = [ autoPatchelfHook ];
+      src =
+        if overrideUnpackCmd then
+          (fetchurl {
+            url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}";
+            hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive};
+          }) else
+          (fetchzip {
+            url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}";
+            stripRoot = false;
+            hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive};
+          });
+
+      setSourceRoot = if overrideUnpackCmd then "sourceRoot=`pwd`" else null;
+      unpackCmd = if overrideUnpackCmd then "unzip -o $src -d $out" else null;
 
       installPhase =
         let
@@ -117,13 +180,13 @@ let
             (architecture: variants: {
               base = map
                 (args: mkArtifactDerivation ({
-                  platform = "${os}-${architecture}";
+                  platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}";
                 } // args))
                 variants.base;
               variants = builtins.mapAttrs
                 (variant: variantArtifacts: map
                   (args: mkArtifactDerivation ({
-                    platform = "${os}-${architecture}";
+                    platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}";
                     inherit variant;
                   } // args))
                   variantArtifacts)
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 19f21391ab90..a3a3c3de6035 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -6,10 +6,12 @@
     android-arm-profile = {
       "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4=";
       "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg=";
+      "darwin-x64.zip" = "sha256-gOmxGurYyuuGxPnzK+2O1s7d7x514R9MfincibxVTCI=";
     };
     android-arm-release = {
       "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho=";
       "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY=";
+      "darwin-x64.zip" = "sha256-UiJNbIvjYvIX2oFNCz+TurUdhHS8vcl9X6WEkEs5hvU=";
     };
     android-arm64 = {
       "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ=";
@@ -17,10 +19,12 @@
     android-arm64-profile = {
       "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0=";
       "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0=";
+      "darwin-x64.zip" = "sha256-AWivGn0TCVEW+N8g9bpEP1JuKWhrccb+ANQgyLjBjfw=";
     };
     android-arm64-release = {
       "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE=";
       "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg=";
+      "darwin-x64.zip" = "sha256-/j5sVfyllkhsc9mpdbOqlT7VT1H6nD3Y+mYnWXDh0yI=";
     };
     android-x64 = {
       "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q=";
@@ -28,10 +32,12 @@
     android-x64-profile = {
       "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM=";
       "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs=";
+      "darwin-x64.zip" = "sha256-J5JJH9GAQaQKahimb09fLC59VchPP15iMHY9bDMfdf8=";
     };
     android-x64-release = {
       "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY=";
       "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U=";
+      "darwin-x64.zip" = "sha256-hDftGgKqW6tzH/+jFOYfzxssbS01XtiWEeycJr3QSoc=";
     };
     android-x86 = {
       "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y=";
@@ -39,8 +45,46 @@
     android-x86-jit-release = {
       "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk=";
     };
+    darwin-arm64 = {
+      "artifacts.zip" = "sha256-lfkEToKFBBOee7KgOl1z/ZeMQwEBWkmAYb2Hbfk8dfg=";
+      "font-subset.zip" = "sha256-W7GnLvCobED7uyhpURF4T4SL4yZIQmE2JFQVQIxl0NI=";
+    };
+    darwin-arm64-profile = {
+      "artifacts.zip" = "sha256-DfYS+FEqjtq02jFRBqVR3SVWe4LAoPa5MMKWCbvF7mI=";
+    };
+    darwin-arm64-release = {
+      "artifacts.zip" = "sha256-gG/OcCJE3XPO6T8bltMtPxdlYX5HQ/4qYsdHe0OdDaE=";
+    };
+    darwin-x64 = {
+      "FlutterEmbedder.framework.zip" = "sha256-tU/Y1ZJD5j03KaH2Qm/ltc/royX3yikqkHVfxcokV48=";
+      "FlutterMacOS.framework.zip" = "sha256-yjr3xCrJ/HUWD90R2Hk4JC91sDiQYD9I92c7/0KwW1Q=";
+      "artifacts.zip" = "sha256-H7Moy6E1eRrOXYYAIgiJHOmstyy3YaCnu8O3IPr9BK8=";
+      "font-subset.zip" = "sha256-VSkG3zZw/4DDInwxPaMXT2B1LXIb0Ejkb2xf5SVrwW4=";
+      "gen_snapshot.zip" = "sha256-Pknv1fUcXGbWzt6So0DgWnvL4b43k51KMWiX1YXd2As=";
+    };
+    darwin-x64-profile = {
+      "FlutterMacOS.framework.zip" = "sha256-YxskgIfeBn/OqR3O9TRUc4UEnfGVb0WihwSSi3lZrsY=";
+      "artifacts.zip" = "sha256-8Aj2+nTKKeVLEYN+swVlVqRB/3fVSwrb3i1g1JUDsNY=";
+      "gen_snapshot.zip" = "sha256-bi3RqSdOQODpPmY+eBUQPiNeZ/bECoOUx/pOADpTZiA=";
+    };
+    darwin-x64-release = {
+      "FlutterMacOS.dSYM.zip" = "sha256-LfDQuCcBXEV3Jao/sbfIvjn1d2ZfZrWgzNzFE1zE3Rw=";
+      "FlutterMacOS.framework.zip" = "sha256-R6B2fBKfbvfsD7YNWNbuS4qRknOaZ9kfiN4S7z9sLC0=";
+      "artifacts.zip" = "sha256-3p41zRjvWYCl/Kk/7/0MjV2FS10XEtyX1hYmxTHT8lU=";
+      "gen_snapshot.zip" = "sha256-ExXwj1QO1XQznZ49rW08tibA5BaURShE6pUYDokZfpE=";
+    };
     "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k=";
     "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA=";
+    ios = {
+      "artifacts.zip" = "sha256-yqJ4+lNsedRFbe11dBK4KGMX5+Nilj1V0i2E94n7q+0=";
+    };
+    ios-profile = {
+      "artifacts.zip" = "sha256-ZguLM1QoYyg5dXPw3Fl1zSLdbirShV3xZuxl1CfEf50=";
+    };
+    ios-release = {
+      "Flutter.dSYM.zip" = "sha256-Y57wt1y4NIdbRMM1r/d1Dv8bekwO9/9gpLkTEcw7Hfs=";
+      "artifacts.zip" = "sha256-Sm4Pkm1mWu3k5S+aws+kRpth+o3yTBYITg23LhnSViE=";
+    };
     linux-arm64 = {
       "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw=";
       "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU=";
@@ -75,10 +119,12 @@
     android-arm-profile = {
       "artifacts.zip" = "sha256-MZK1zaSv9yuZaVDR1dReCM7WRDxKql0yxsPa8WFc1yw=";
       "linux-x64.zip" = "sha256-9OlBv2C6Msj73g624TixbstudCTbdIJ6PzPMsbQENy4=";
+      "darwin-x64.zip" = "sha256-lVJ31F7UMaXQym3touJQ2cN8svKBaWJurDTVZPeMzCo=";
     };
     android-arm-release = {
       "artifacts.zip" = "sha256-tjHckwoxQkkKoyTl6+wBKK40mFDmSDvCPNhBHVA+xxw=";
       "linux-x64.zip" = "sha256-zE9oYkv4WBcbgEdYfYIcdDXX3tnYfCg+3KA3oA03nYA=";
+      "darwin-x64.zip" = "sha256-mCr29gIn808NF4k8kdC7oLTSU6AXq7I/bJF3BBdJlAo=";
     };
     android-arm64 = {
       "artifacts.zip" = "sha256-8W/JrOGhAzHWpM2Jh9vjdkaB6ODmCItqcmF47GqbNQk=";
@@ -86,10 +132,12 @@
     android-arm64-profile = {
       "artifacts.zip" = "sha256-9SGBWp05lxLQTpLuzq8FYSQQOpjo8UL93Pv4YYFD4QE=";
       "linux-x64.zip" = "sha256-5nH2AAxupRIhn8gNH+1V+vSP+qqfx5MS97EC4s3QHe8=";
+      "darwin-x64.zip" = "sha256-kkutEwKcj1wKJREbxbx8+DW53WVbizg6zKIFFVujgAM=";
     };
     android-arm64-release = {
       "artifacts.zip" = "sha256-7O7RBfEo6enZtVNsnt4HH0bex8Xpz9mqCvb2LNLbg3Q=";
       "linux-x64.zip" = "sha256-loucmX4+0R11L1nzewiMTeRZoB6wLK0WasW5W3rIvYU=";
+      "darwin-x64.zip" = "sha256-0bpNQDfIzQqwQpzThLfOXEEEpH/uCJCRF331d0/pzfs=";
     };
     android-x64 = {
       "artifacts.zip" = "sha256-j7AezbyzH07yOR0/W1ttfCjMHMdOlXLQjAsu/ExqmqA=";
@@ -97,10 +145,12 @@
     android-x64-profile = {
       "artifacts.zip" = "sha256-J8cqdcHoj1hpo6zY5R6S9lvkVXp7wvzQlurM7TEUe+k=";
       "linux-x64.zip" = "sha256-YuRHctkDjLZVGQr+m5uM+AxYNLkfqycV4UNcAp7JavE=";
+      "darwin-x64.zip" = "sha256-Mw8C279cVbQHTdIsHhIT5HWe52X8XXbkIDpVcEz1tWc=";
     };
     android-x64-release = {
       "artifacts.zip" = "sha256-uhq3fXcxXjF4/YHSkf6V4wToL9jOUKBm3978j/7xI/s=";
       "linux-x64.zip" = "sha256-iJfatLW7jVcrfNdVx/QOPiyON5ce0tSNGOBx0TILrKE=";
+      "darwin-x64.zip" = "sha256-3P3QZ+jW3Jl6PJvRY9pBHQdhj8UcsHFAjln8q6UlL+A=";
     };
     android-x86 = {
       "artifacts.zip" = "sha256-/xLacCi65hg1gEahty0btrc+NR/jfebSAIt31qwIlZY=";
@@ -108,8 +158,46 @@
     android-x86-jit-release = {
       "artifacts.zip" = "sha256-Ntq0i+sFruDhlyp9VBxBnsNqqGoQeXMeIwfi+BNlr0Q=";
     };
+    darwin-arm64 = {
+      "artifacts.zip" = "sha256-A21Tnn4jC5IzdL3c7n6/q9H6uJ/ofvJ+K9W8PPpAoYM=";
+      "font-subset.zip" = "sha256-NhnUOK1Gn4ekKOf5rDoy4HodzhlS8ylf/MN/6l4Dk18=";
+    };
+    darwin-arm64-profile = {
+      "artifacts.zip" = "sha256-aDWrz3bebC6kZRe2LgunsmFhbxJhmP1bsZv5A/SGF2Y=";
+    };
+    darwin-arm64-release = {
+      "artifacts.zip" = "sha256-F44e39KSX8juojFBV/CSvFES+RQW+gHKDWtfnydqiNo=";
+    };
+    darwin-x64 = {
+      "FlutterEmbedder.framework.zip" = "sha256-+S2unNH8cpfqUiPLTwGUUW00DdNYFDN8KM/O1pMdxQs=";
+      "FlutterMacOS.framework.zip" = "sha256-iCGXzxBhJGR6rWcECRg0W5Qv4I6ePo7UrWIqjQK1bWI=";
+      "artifacts.zip" = "sha256-2Ng0rxVDeMCH3kFHS7rhVd6R8oiJqvfsNDp+rzgtA50=";
+      "font-subset.zip" = "sha256-5IyNNLUT27WUCr61LjnMjmAZEv63ZaF+rl/p2XHFlVU=";
+      "gen_snapshot.zip" = "sha256-zPJaXPdvbQGx79c41XdRrBW/+3aV/INaPtO47+hHdxM=";
+    };
+    darwin-x64-profile = {
+      "FlutterMacOS.framework.zip" = "sha256-PV4sTACDGeLLPz+AchxngWrQypmmUVQ48bQlAfH323w=";
+      "artifacts.zip" = "sha256-LBosuXu9mPh5WT0Mmgu9rX5Nuy+iIGN8Xvi7uVAyFhc=";
+      "gen_snapshot.zip" = "sha256-douXVnavzSGBuld3WhwHagBNK6FEU679puM8/fNGz2I=";
+    };
+    darwin-x64-release = {
+      "FlutterMacOS.dSYM.zip" = "sha256-A8kyc1fmsGemgUVhI46yTC6XNkrXdoPYvwXomHoW6kM=";
+      "FlutterMacOS.framework.zip" = "sha256-dZ/MO9J+zanoGfvPaAinnANte92bQOlh697fd/LvGqA=";
+      "artifacts.zip" = "sha256-T/wxPd1LmstfGHr2Fx6cfhRifaGm6CUlig6cBMcOO5g=";
+      "gen_snapshot.zip" = "sha256-qeZxVp6btr/fUQRf7nOhlnSC03+QTcRaggiVOmPxVuo=";
+    };
     "flutter_patched_sdk.zip" = "sha256-kRRFCqQGBDimqwMiSn4yRMNRfZHt03YJqsKW47IBIvQ=";
     "flutter_patched_sdk_product.zip" = "sha256-BowamIQHPZgfcZbWG7OFrB5GeEwdcA7AdUrF2Y+KIds=";
+    ios = {
+      "artifacts.zip" = "sha256-VoofDPEBUW2jBrXg3Z556uC2UdrD9JCpioZNhX1p/P0=";
+    };
+    ios-profile = {
+      "artifacts.zip" = "sha256-5jDIqk7tWuRxXsAzrjBq9xzQrt/eREmmoEF3zc2xQ5M=";
+    };
+    ios-release = {
+      "Flutter.dSYM.zip" = "sha256-TuDld2LcHshl1mXcuIwfZgWLm1My4RpXUwI2B/QbLRk=";
+      "artifacts.zip" = "sha256-bGuUCKVqNNWWGVccVVKIBmCxTqgu4Q2Kj/Znnl9ZR2Q=";
+    };
     linux-arm64 = {
       "artifacts.zip" = "sha256-jME3ivE+M+ceAt3aGPSeVwPaW8UhwGQOoL5lmRUqrOU=";
       "font-subset.zip" = "sha256-MqavBMXOlx5JX94Oe/8GGuuDNh7A2UkjiOrEhCDW5cc=";
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 59492f81231c..49dcb4c3658d 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -5,6 +5,7 @@
 , src
 , lib
 , stdenv
+, darwin
 , git
 , which
 }:
@@ -18,6 +19,8 @@ let
       outputs = [ "out" "cache" ];
 
       buildInputs = [ git ];
+      nativeBuildInputs = [ ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
 
       preConfigure = ''
         if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then
@@ -69,8 +72,8 @@ let
 
         # Certain prebuilts should be replaced with Nix-built (or at least Nix-patched) equivalents.
         rm -r \
-          bin/cache/dart-sdk \
-          bin/cache/artifacts/engine
+          $FLUTTER_ROOT/bin/cache/dart-sdk \
+          $FLUTTER_ROOT/bin/cache/artifacts/engine
       '';
 
       installPhase = ''
@@ -84,7 +87,8 @@ let
       '';
 
       doInstallCheck = true;
-      nativeInstallCheckInputs = [ which ];
+      nativeInstallCheckInputs = [ which ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
       installCheckPhase = ''
         runHook preInstallCheck
 
@@ -112,7 +116,7 @@ let
         '';
         homepage = "https://flutter.dev";
         license = licenses.bsd3;
-        platforms = [ "x86_64-linux" "aarch64-linux" ];
+        platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
         maintainers = with maintainers; [ babariviere ericdallo FlafyDev gilice hacker1024 ];
       };
     };
diff --git a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
index cc6e5e8f49e0..b7c9c5873945 100644
--- a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
@@ -7,7 +7,7 @@ index dd80b1e46e..8e54517765 100644
  import 'convert.dart';
  import 'features.dart';
 +import 'globals.dart' as globals;
- 
+
  const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
  const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
 @@ -318,8 +319,13 @@ class Cache {
@@ -26,7 +26,7 @@ index dd80b1e46e..8e54517765 100644
        _lock = lockFile.openSync(mode: FileMode.write);
      } on FileSystemException catch (e) {
 @@ -378,8 +384,7 @@ class Cache {
- 
+
    String get devToolsVersion {
      if (_devToolsVersion == null) {
 -      const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
@@ -40,7 +40,7 @@ index 1c31c1b5db..76c7210d3b 100644
 --- a/packages/flutter_tools/lib/src/cache.dart
 +++ b/packages/flutter_tools/lib/src/cache.dart
 @@ -529,6 +529,11 @@ class Cache {
- 
+
    /// Return the top-level directory in the cache; this is `bin/cache`.
    Directory getRoot() {
 +    const Platform platform = LocalPlatform();
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 50c522fd0e04..5685ddebd781 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -1,9 +1,12 @@
 { lib
 , stdenv
+, darwin
 , callPackage
 , flutter
 , supportsLinuxDesktop ? stdenv.hostPlatform.isLinux
-, supportsAndroid ? stdenv.hostPlatform.isx86_64
+, supportsAndroid ? (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin)
+, supportsDarwin ? stdenv.hostPlatform.isDarwin
+, supportsIOS ? stdenv.hostPlatform.isDarwin
 , includedEngineArtifacts ? {
     common = [
       "flutter_patched_sdk"
@@ -12,6 +15,10 @@
     platform = {
       android = lib.optionalAttrs supportsAndroid
         ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });
+      darwin = lib.optionalAttrs supportsDarwin
+        ((lib.genAttrs [ "arm64" "x64" ] (architecture: [ "profile" "release" ])));
+      ios = lib.optionalAttrs supportsIOS
+        ((lib.genAttrs [ "" ] (architecture: [ "profile" "release" ])));
       linux = lib.optionalAttrs supportsLinuxDesktop
         (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
           (architecture: [ "debug" "profile" "release" ]));
@@ -158,7 +165,9 @@ let
 in
 (callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped"
 {
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
 
   passthru = flutter.passthru // {
     inherit (flutter) version;

From 5d9bc8dc7f0112784f1415725dbf15953cbfaef9 Mon Sep 17 00:00:00 2001
From: Sunghoon Kang <me@hoon.dev>
Date: Fri, 7 Jul 2023 13:16:43 +0900
Subject: [PATCH 17/43] flutter: fix hash

Signed-off-by: Sunghoon Kang <me@hoon.dev>
(cherry picked from commit 8cb834992842f291f82da59e12a9804253f35221)
---
 .../compilers/flutter/engine-artifacts/hashes.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index a3a3c3de6035..328e375641ca 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -56,20 +56,20 @@
       "artifacts.zip" = "sha256-gG/OcCJE3XPO6T8bltMtPxdlYX5HQ/4qYsdHe0OdDaE=";
     };
     darwin-x64 = {
-      "FlutterEmbedder.framework.zip" = "sha256-tU/Y1ZJD5j03KaH2Qm/ltc/royX3yikqkHVfxcokV48=";
-      "FlutterMacOS.framework.zip" = "sha256-yjr3xCrJ/HUWD90R2Hk4JC91sDiQYD9I92c7/0KwW1Q=";
+      "FlutterEmbedder.framework.zip" = "sha256-G84GGK6gtR+CYu9S/GhdNTL4KWqgFBp8QdvWOq+IZlk=";
+      "FlutterMacOS.framework.zip" = "sha256-1/txBoXDIs7Gn5zsZ4jYQXK73+iaZV4sRdYKqEBUTxU=";
       "artifacts.zip" = "sha256-H7Moy6E1eRrOXYYAIgiJHOmstyy3YaCnu8O3IPr9BK8=";
       "font-subset.zip" = "sha256-VSkG3zZw/4DDInwxPaMXT2B1LXIb0Ejkb2xf5SVrwW4=";
       "gen_snapshot.zip" = "sha256-Pknv1fUcXGbWzt6So0DgWnvL4b43k51KMWiX1YXd2As=";
     };
     darwin-x64-profile = {
-      "FlutterMacOS.framework.zip" = "sha256-YxskgIfeBn/OqR3O9TRUc4UEnfGVb0WihwSSi3lZrsY=";
+      "FlutterMacOS.framework.zip" = "sha256-3umN1HNX4UA00EFsBnWS0X04QRKlcCnChDYd9L6x1L4=";
       "artifacts.zip" = "sha256-8Aj2+nTKKeVLEYN+swVlVqRB/3fVSwrb3i1g1JUDsNY=";
       "gen_snapshot.zip" = "sha256-bi3RqSdOQODpPmY+eBUQPiNeZ/bECoOUx/pOADpTZiA=";
     };
     darwin-x64-release = {
       "FlutterMacOS.dSYM.zip" = "sha256-LfDQuCcBXEV3Jao/sbfIvjn1d2ZfZrWgzNzFE1zE3Rw=";
-      "FlutterMacOS.framework.zip" = "sha256-R6B2fBKfbvfsD7YNWNbuS4qRknOaZ9kfiN4S7z9sLC0=";
+      "FlutterMacOS.framework.zip" = "sha256-2xuPPJifdu/kvvtR0viMvbTOXfv8ndtNAhTmef8863o=";
       "artifacts.zip" = "sha256-3p41zRjvWYCl/Kk/7/0MjV2FS10XEtyX1hYmxTHT8lU=";
       "gen_snapshot.zip" = "sha256-ExXwj1QO1XQznZ49rW08tibA5BaURShE6pUYDokZfpE=";
     };

From c18a826278151566a69494fee3b3edb09cb71f62 Mon Sep 17 00:00:00 2001
From: Sunghoon Kang <me@hoon.dev>
Date: Fri, 7 Jul 2023 16:56:40 +0900
Subject: [PATCH 18/43] flutter: revert patch changes

Signed-off-by: Sunghoon Kang <me@hoon.dev>
(cherry picked from commit 77618bd28b141f57d39e037f60dba74b2bfbe3d1)
---
 .../compilers/flutter/patches/flutter3/move-cache.patch     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
index b7c9c5873945..cc6e5e8f49e0 100644
--- a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
@@ -7,7 +7,7 @@ index dd80b1e46e..8e54517765 100644
  import 'convert.dart';
  import 'features.dart';
 +import 'globals.dart' as globals;
-
+ 
  const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
  const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
 @@ -318,8 +319,13 @@ class Cache {
@@ -26,7 +26,7 @@ index dd80b1e46e..8e54517765 100644
        _lock = lockFile.openSync(mode: FileMode.write);
      } on FileSystemException catch (e) {
 @@ -378,8 +384,7 @@ class Cache {
-
+ 
    String get devToolsVersion {
      if (_devToolsVersion == null) {
 -      const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
@@ -40,7 +40,7 @@ index 1c31c1b5db..76c7210d3b 100644
 --- a/packages/flutter_tools/lib/src/cache.dart
 +++ b/packages/flutter_tools/lib/src/cache.dart
 @@ -529,6 +529,11 @@ class Cache {
-
+ 
    /// Return the top-level directory in the cache; this is `bin/cache`.
    Directory getRoot() {
 +    const Platform platform = LocalPlatform();

From fc469a5da04f4004d4b6f6a25fbff3e15e45d8d9 Mon Sep 17 00:00:00 2001
From: Sunghoon Kang <me@hoon.dev>
Date: Fri, 7 Jul 2023 16:59:52 +0900
Subject: [PATCH 19/43] flutter: revert unnecessary extension extraction

Signed-off-by: Sunghoon Kang <me@hoon.dev>
(cherry picked from commit 37a10c3cb7f0117ef0e0662e2059c5fd0ce6a4ce)
---
 .../development/compilers/flutter/engine-artifacts/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
index 32533d277bc2..249e9217325b 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
@@ -135,8 +135,7 @@ let
   mkArtifactDerivation = { platform ? null, variant ? null, subdirectory ? null, archive, ... }@args:
     let
       artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}";
-      archiveExtension = ".${(lib.last (lib.splitString "." archive))}";
-      archiveBasename = lib.removeSuffix archiveExtension archive;
+      archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive;
       overrideUnpackCmd = builtins.elem archive [ "FlutterEmbedder.framework.zip" "FlutterMacOS.framework.zip" ];
     in
     stdenv.mkDerivation ({

From bbf6b97efc9bdb036821a4894b274f1a0cd592e9 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Tue, 8 Aug 2023 11:52:54 +0200
Subject: [PATCH 20/43] flutter: link notices to all of the artifact
 directories.

The flutter team has also started doing this, but only for new
artifacts. This way, we also do it for older artifacts.

(cherry picked from commit c34385b52cdd48aa4aa50b95f12f61fe71fc7d0e)
---
 .../flutter/engine-artifacts/default.nix      | 41 +++++++++++++++++++
 .../flutter/engine-artifacts/hashes.nix       |  4 ++
 .../development/compilers/flutter/wrapper.nix |  5 ++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
index 249e9217325b..41201bdb94e5 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
@@ -6,13 +6,43 @@
 , fetchzip
 , autoPatchelfHook
 , gtk3
+, flutterVersion
 , unzip
+, stdenvNoCC
 }:
 
 let
   hashes = (import ./hashes.nix).${engineVersion} or
     (throw "There are no known artifact hashes for Flutter engine version ${engineVersion}.");
+  noticeText = stdenvNoCC.mkDerivation (finalAttrs: {
+    pname = "flutter-notice";
+    version = engineVersion;
+    dontUnpack = true;
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE";
+      sha256 = hashes.skyNotice;
+    };
+    flutterNotice = fetchurl {
+      url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE";
+      sha256 = hashes.flutterNotice;
+    };
+    installPhase =
+      ''
+        SRC_TEXT="$(cat $src)"
+        FLUTTER_NOTICE_TEXT="$(cat $flutterNotice)"
+        cat << EOF > $out
+        This artifact is from the Flutter SDK's engine.
+        This file carries third-party notices for its dependencies.
+        See also other files, that have LICENSE in the name, in the artifact directory.
 
+        Appendix 1/2: merged sky_engine LICENSE file (also found at ${finalAttrs.src.url})
+        $SRC_TEXT
+
+        Appendix 2/2: Flutter license (also found at ${finalAttrs.flutterNotice.url})
+        $FLUTTER_NOTICE_TEXT
+        EOF
+      '';
+  });
   artifacts =
     {
       common = {
@@ -165,6 +195,17 @@ let
           destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}";
         in
         ''
+          # ship the notice near all artifacts. if the artifact directory is / multiple directories are nested in $src, link it there. If there isn't a directory, link it in root
+          # this *isn't the same as the subdirectory variable above*
+          DIR_CNT="$(echo */ | wc -w)"
+          if [[ "$DIR_CNT" == 0 ]]; then
+            ln -s ${noticeText} LICENSE.README
+          else
+            for dir in */
+            do
+              ln -s ${noticeText} "$dir/LICENSE.README"
+            done
+          fi
           mkdir -p "${destination}"
           cp -r . "${destination}"
         '';
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 328e375641ca..1e1b3fa02e8e 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -1,5 +1,7 @@
 {
   "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
+    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";
     };
@@ -113,6 +115,8 @@
     };
   };
   "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = {
+    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU=";
     };
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 5685ddebd781..a650b1853fd4 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -56,7 +56,10 @@
 }:
 
 let
-  engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; };
+  engineArtifacts = callPackage ./engine-artifacts {
+    inherit (flutter) engineVersion;
+    flutterVersion = flutter.version;
+  };
   mkCommonArtifactLinkCommand = { artifact }:
     ''
       mkdir -p $out/artifacts/engine/common

From 9870f505e35f867e5858776a110443c241d87296 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 13 Aug 2023 14:09:58 +0100
Subject: [PATCH 21/43] flutter37: fix skyNotice hash for version
 1a65d409c7a1438a34d21b60bf30a6fd5db59314

Using fetchurl like this means that, if you build the `flutter`
derivation first, you will get a file named "LICENSE" in your store with
the correct hash. `flutter37` will then build because this file is
already in your store, even though the LICENSE to which _it_ refers is
different. This is dangerous in this case - but an intentional design
decision in the way fetchurl works to allow artifacts which are the same
to be fetched from arbitrary sources, or even pre-populated into the
store.

To avoid this, explicitly tag the fetchurl with a name and the commit
hash we're fetching from. This means we _must_ fetch these separately
for each flutter version and avoids the problem of accidentally reusing
artifacts for a different build.

(cherry picked from commit 19cd58a6ca6153a62139128e93876d5e6e703b62)
---
 .../compilers/flutter/engine-artifacts/default.nix            | 4 ++++
 .../development/compilers/flutter/engine-artifacts/hashes.nix | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
index 41201bdb94e5..603b1456018d 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
@@ -19,10 +19,14 @@ let
     version = engineVersion;
     dontUnpack = true;
     src = fetchurl {
+      pname = "flutter-sky_engine-LICENSE";
+      version = engineVersion;
       url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE";
       sha256 = hashes.skyNotice;
     };
     flutterNotice = fetchurl {
+      pname = "flutter-LICENSE";
+      version = engineVersion;
       url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE";
       sha256 = hashes.flutterNotice;
     };
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 1e1b3fa02e8e..acecb0c95b28 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -1,6 +1,6 @@
 {
   "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
-    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    skyNotice = "sha256-+EitMZAAvJ1mIlfm5ZTfY+pk8tfyu33XM7P8qOdj+J8=";
     flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";

From d3b75dc5766cdb39b874f7ea026cc16b957d82b3 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Fri, 25 Aug 2023 19:07:46 +0200
Subject: [PATCH 22/43] flutter: 3.10.5 -> 3.13.0

flutter: Update remaining engine artifact hashes for v3.13.0

Co-Authored-By: hacker1024 <20849728+hacker1024@users.noreply.github.com>
(cherry picked from commit 40e82051b94f52a60473e2d0fef010bd1f402184)
---
 .../development/compilers/flutter/default.nix |  20 +--
 .../flutter/engine-artifacts/hashes.nix       | 118 ++++++++++++++++++
 .../flutter3/disable-auto-update.patch        |  56 ++++-----
 .../flutter/patches/flutter3/git-dir.patch    |  64 ++++------
 4 files changed, 179 insertions(+), 79 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 04a8d874bf86..e23d5b9b3b8e 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -75,20 +75,20 @@ in
 {
   inherit wrapFlutter;
   stable = mkFlutter {
-    version = "3.10.5";
-    engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420";
-    dartVersion = "3.0.5";
+    version = "3.13.0";
+    engineVersion = "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952";
+    dartVersion = "3.1.0";
     dartHash = {
-      x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28=";
-      aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ=";
-      x86_64-darwin = "sha256-4gJ659bNzs2lfI1LRwFACgu/ttkj+3xIrqLijju+CaI=";
-      aarch64-darwin = "sha256-RJt+muq5IrcAhVLYEgdbVygcY1oB7tnVCN+iqktC+6c=";
+      x86_64-linux = "sha256-sGpRyuUTkZ0cpG/O21NCHaOsQRjNklsl9G6Ia1tZxAw=";
+      aarch64-linux = "sha256-wcDtL/Lh0NFC01QlnKwx8ovTHZ5ww+rb1sELn92R1uU=";
+      x86_64-darwin = "sha256-h+e7ABlLWCxc6wrbjiy5lgp6O/DnNKdXFNJtgnXBZNA=";
+      aarch64-darwin = "sha256-sAWnd09mbcRLP0WjSjjWF7+WQ7LP3tWsq5Kqw8e4APg=";
     };
     flutterHash = rec {
-      x86_64-linux = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI=";
+      x86_64-linux = "sha256-gXNQ9RuHVC/3puHNygWPRdezx8iiKmiOnxQmoX6XUFo=";
       aarch64-linux = x86_64-linux;
-      x86_64-darwin = "sha256-1ZC5aCoGVBCeTSsu/ZEl1v53lLnzulx8Ya6YXvo4yIY=";
-      aarch64-darwin = "sha256-TCMempLjO47IbP5MAZVHlXXvNaURGo+EbaL0K8e27wU=";
+      x86_64-darwin = "sha256-vI8TsXIfTg4PYf5dzxDaJt+PIdmVFBmd2slKK7c1By0=";
+      aarch64-darwin = "sha256-VhGJlp+HG8QLZx8u0xK+cgbneoDM7zhNvm3Oco4nBms=";
     };
     patches = flutter3Patches;
   };
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index acecb0c95b28..786d77de9ace 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -229,6 +229,7 @@
       "linux-x64-flutter-gtk.zip" = "sha256-eluXkoISuzObXt2aiBmZGW6x8MsPTiD9bbVM4xcpe2w=";
     };
   };
+
   "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab" = {
     android-arm = {
       "artifacts.zip" = "sha256-3igOO+rgFh0fNTIIiiucqSmqC+NKFPG5H1CnIa9bDcM=";
@@ -369,4 +370,121 @@
       "linux-x64-flutter-gtk.zip" = "sha256-SA7Th1Qasaj4Q5wFr89Rv8PNQx6s6zvHsDxT1EKKZV0=";
     };
   };
+
+  "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952" = {
+    skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
+    android-arm = {
+      "artifacts.zip" = "sha256-rAWcm/vjJ7P9q69z0bZNhBv/NO+sGhFJe+r/BHPR1To=";
+    };
+    android-arm-profile = {
+      "artifacts.zip" = "sha256-08+LDA7qNcMFH4xk+WfAXYqIDueCSHNmD/i/XaDeTrA=";
+      "linux-x64.zip" = "sha256-LWdrWdSGDAfX0gGtqQ2mSschBW3EAgaBldL/Cw99ft8=";
+      "darwin-x64.zip" = "sha256-FeBLBp3U2BPun/iPpTmHvaj3ZO8l7DQhwArqKN+D1m0=";
+    };
+    android-arm-release = {
+      "artifacts.zip" = "sha256-VCWSWfL74PJ6F6N18mOHjOkN8oTkL8coDfemV0Pc/Fw=";
+      "linux-x64.zip" = "sha256-xtQJ9merALKe20LZai+5ApJNOXR3uweIYQFWSyjmBEE=";
+      "darwin-x64.zip" = "sha256-YuEY7ZQAqpo0wbvI/iK3YYUSguZGi/wSl/DLPzmlNj8=";
+    };
+    android-arm64 = {
+      "artifacts.zip" = "sha256-z4gvkNofQaFv8tFAXcLepsge9CV1T7cBe3EZRdBT7Ms=";
+    };
+    android-arm64-profile = {
+      "artifacts.zip" = "sha256-7DHKcgwdaG6+MH7uVqSk2UGxLM4VsHVk5vUtYMn11kQ=";
+      "linux-x64.zip" = "sha256-3ZahRPzDVBff2pGUjjoIABH1lmwyrx05GnaJNyF4OiY=";
+      "darwin-x64.zip" = "sha256-Pmil9S314EoWJhfo0nrtBh1VLUeiavKvp/LIPZJoy6U=";
+    };
+    android-arm64-release = {
+      "artifacts.zip" = "sha256-GI+ADau8sbD9+ctXrciraeXNPGMto2+bBDyJcKt9YTE=";
+      "linux-x64.zip" = "sha256-riHs2bbOFNH7VqD3snEu5RuKrMqbsuFnDBZ9Apxq/+g=";
+      "darwin-x64.zip" = "sha256-DwTskXkcNqNsU3I+t9UMvKjxG4O2mN4cUGLB4dSWBHM=";
+    };
+    android-x64 = {
+      "artifacts.zip" = "sha256-0dkDhr/TJi4ROcN1BV1OsUwWSnZuEHzgM0DKSeUIrnA=";
+    };
+    android-x64-profile = {
+      "artifacts.zip" = "sha256-2g+GaZHO17/rLa6Y1DHfDEq0Q05NRxQ5ese2Eo5rvNA=";
+      "linux-x64.zip" = "sha256-O3bHS/UHz8ymXq8ZEutLIj7K8wVTdt7vTo3OLGAkkh8=";
+      "darwin-x64.zip" = "sha256-vEzg6vxm1CbvVBSAoWwZhAS/bsuDlesmo30zWwK2a7g=";
+    };
+    android-x64-release = {
+      "artifacts.zip" = "sha256-nlYI2ffULiDrehOSFEZkZoav/RJ0VykwREQkUwNX2/I=";
+      "linux-x64.zip" = "sha256-iUy8tjpkFd3V/RIVRPbNNEsa/GAXhtLsNAkEOvdKhks=";
+      "darwin-x64.zip" = "sha256-xZf2f4L/hSJEN63hQqtP0rbXkB2iw/Co4vLXYe/oeI4=";
+    };
+    android-x86 = {
+      "artifacts.zip" = "sha256-OIB7VnhCasOflVtGFOe1DgCLP4Os82R6H7ucp0Wrez0=";
+    };
+    android-x86-jit-release = {
+      "artifacts.zip" = "sha256-dyjGkQJu73sOaxKvmIlbS5j0zO78RXHZrJQVi7qpBAU=";
+    };
+    darwin-arm64 = {
+      "artifacts.zip" = "sha256-Ro+N5e5RhXgfqVDSEvqCKPdXRK1QnYCvIqmtlEW4s8c=";
+      "font-subset.zip" = "sha256-yCboANBEarWZDtoTwDFbtnlsPW2kPwZ5Jp31V2hbga4=";
+    };
+    darwin-arm64-profile = {
+      "artifacts.zip" = "sha256-Lf3LLkRhtGNA9cWZwv4Q9MncXzOoVCgmp+6osWRUCE0=";
+    };
+    darwin-arm64-release = {
+      "artifacts.zip" = "sha256-6BSQ2zodrQmZKkHeaGVVT4D7jNekhwNOul5C6qwLbO8=";
+    };
+    darwin-x64 = {
+      "FlutterEmbedder.framework.zip" = "sha256-4jYk+aYjOS/CZajS1oVBexg2+C9fy0OmfaI6i3rrhXo=";
+      "FlutterMacOS.framework.zip" = "sha256-Im7DTFf1zXrG6n1OtM4Jixd992mS2r47GRnAa7/urNc=";
+      "artifacts.zip" = "sha256-SdnPPnx4NOfOlJU1234977/cVRCa/5KTI/1kqCtTxG0=";
+      "font-subset.zip" = "sha256-F7qt7X0FNXODb3rvTkXacK3wG/aEVn+ny8DHFL3gEkI=";
+      "gen_snapshot.zip" = "sha256-czdCi1cPdD/nu0LJIsgUj42O6D5x5xTKfM8l/UiKZqw=";
+    };
+    darwin-x64-profile = {
+      "FlutterMacOS.framework.zip" = "sha256-gdfoq6jdHFDb2JXCf45qJ2ekTildUptLb/k0XuHYuh8=";
+      "artifacts.zip" = "sha256-aEoenQh0Q8xuLU6OeFND3GBbOvhMNsovbbFQwQfudm0=";
+      "gen_snapshot.zip" = "sha256-tY3qmpdF7MP4iEfqgouzLehr901H3QTLxeV28RoLPDY=";
+    };
+    darwin-x64-release = {
+      "FlutterMacOS.dSYM.zip" = "sha256-dNlx9PsXeJeV6FMPOliRyuc5p58DeEmXus2zP1dOqPs=";
+      "FlutterMacOS.framework.zip" = "sha256-ibmcuVjd3kswmUvXzZi8vl5uNEbnWvMAwzWYxs8i1zw=";
+      "artifacts.zip" = "sha256-KCXwR/ZZK1jyLQaIAsb+wAz4awVU1QozydIQt10M30A=";
+      "gen_snapshot.zip" = "sha256-hZT+IMHbvSTjk2WcNvfPl+vdXZ2vbB/MjiYP1Q+cKD8=";
+    };
+    "flutter_patched_sdk.zip" = "sha256-vm9Zt+obBuYHQchQlqlinGYg9mwmoo41HwqYzy8QXP0=";
+    "flutter_patched_sdk_product.zip" = "sha256-JjMQ2zEGXKIcyYqYfCxDYlRbwglVMQ8H1zs5h6To1es="
+    ;
+    ios = {
+      "artifacts.zip" = "sha256-9/GWCsOvwEXVWYMYn48sZTe44GhB2JBJtPDRFUqgTek=";
+    };
+    ios-profile = {
+      "artifacts.zip" = "sha256-XZ4AFdG60gUx2xv3qZdk8Hh/0ZuIeJXeBxBoWlmhP4I=";
+    };
+    ios-release = {
+      "Flutter.dSYM.zip" = "sha256-QWCVU518mUHDXDdUm58XfS1TWYNkXI8LnfOIZ0PYLjs=";
+      "artifacts.zip" = "sha256-tFmIpEogaqCcx4ftVRah3Bw3CeB0dTku0xUMvUVfR00=";
+    };
+    linux-arm64 = {
+      "artifacts.zip" = "sha256-MFsYOUIYLRINLNOjsDLFX4WPwcW3FTQ7P55/i8xQqcI=";
+      "font-subset.zip" = "sha256-nIWE1Mep1R1EMS3vS31qdTybhFOCyr7/agPEjlAodOQ=";
+    };
+    linux-arm64-debug = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-2zYHns8gycYy7VNjXfJdf/yl71VJSDFSIMb6lQ0JuKI=";
+    };
+    linux-arm64-profile = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-doGUIbTinn5kfw20NZRyph96ZkSa77Vm+y1Z/jBUi/E=";
+    };
+    linux-arm64-release = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-3zeRvhTZ3nFhOuiacJLTTlPBkyP1u3lh00j3e4jJpXU=";
+    };
+    linux-x64 = {
+      "artifacts.zip" = "sha256-L8DrlHTLYneYo5yMdgXVZw3YikF0qBKijGVLJZJLTEA=";
+      "font-subset.zip" = "sha256-KC733fwlRIK6DhjAJopnKdzjaC1JhvJ8nK74x+5DtIE=";
+    };
+    linux-x64-debug = {
+      "linux-x64-flutter-gtk.zip" = "sha256-5hu5uRB4gOnZyH4zWBj/b2Flz6+5DUK2ytTHWGVfp4A=";
+    };
+    linux-x64-profile = {
+      "linux-x64-flutter-gtk.zip" = "sha256-gYGBrExyYlIl+nYnCvlGBq13bP0E5bzzM089THEqHBM=";
+    };
+    linux-x64-release = {
+      "linux-x64-flutter-gtk.zip" = "sha256-Hw/hAMohLko1AMu3sr4Dq5OwvmrBP2PPJcJRVMgy6B4=";
+    };
+  };
 }
diff --git a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
index 874619046134..ceaf59b5f535 100644
--- a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
+++ b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
@@ -1,8 +1,8 @@
 diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
-index ab746724e9..1087983c87 100644
+index 3532c23114..25dfcae4c7 100644
 --- a/bin/internal/shared.sh
 +++ b/bin/internal/shared.sh
-@@ -215,8 +215,6 @@ function shared::execute() {
+@@ -229,8 +229,6 @@ function shared::execute() {
      exit 1
    fi
  
@@ -11,35 +11,11 @@ index ab746724e9..1087983c87 100644
    BIN_NAME="$(basename "$PROG_NAME")"
    case "$BIN_NAME" in
      flutter*)
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 738fef987d..03a152e64f 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.flutterUsage.suppressAnalytics = true;
-         }
- 
--        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults['machine'] as bool? ?? false;
-         final bool ci = await globals.botDetector.isRunningOnBot;
-         final bool redirectedCompletion = !globals.stdio.hasTerminal &&
-@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
-         final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false;
-         final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
- 
--        if (topLevelResults.command?.name != 'upgrade' &&
--            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
--          await globals.flutterVersion.checkFlutterVersionFreshness();
--        }
- 
-         // See if the user specified a specific device.
-         globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
-
 diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
-index dd80b1e46e..8e54517765 100644
+index 13efbde879..467b3a7cbf 100644
 --- a/packages/flutter_tools/lib/src/cache.dart
 +++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -668,6 +668,7 @@
+@@ -664,6 +664,7 @@ class Cache {
  
    /// Update the cache to contain all `requiredArtifacts`.
    Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async {
@@ -47,3 +23,27 @@ index dd80b1e46e..8e54517765 100644
      if (!_lockEnabled) {
        return;
      }
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index 5d6d78639f..90a4dfa555 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+           globals.flutterUsage.suppressAnalytics = true;
+         }
+ 
+-        globals.flutterVersion.ensureVersionFile();
+         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
+         final bool ci = await globals.botDetector.isRunningOnBot;
+         final bool redirectedCompletion = !globals.stdio.hasTerminal &&
+@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+         final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false;
+         final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag;
+ 
+-        if (topLevelResults.command?.name != 'upgrade' &&
+-            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
+-          await globals.flutterVersion.checkFlutterVersionFreshness();
+-        }
+-
+         // See if the user specified a specific device.
+         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
+         if (specifiedDeviceId != null) {
diff --git a/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch b/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
index 42ad756f8ea4..6e6ae4e6fb98 100644
--- a/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
+++ b/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch
@@ -1,8 +1,8 @@
 diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
-index 8e4cb81340..2c20940423 100644
+index 9f33a22cc3..c46255742c 100644
 --- a/dev/bots/prepare_package.dart
 +++ b/dev/bots/prepare_package.dart
-@@ -526,7 +526,7 @@ class ArchiveCreator {
+@@ -602,7 +602,7 @@ class ArchiveCreator {
  
    Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
      return _processRunner.runProcess(
@@ -12,10 +12,10 @@ index 8e4cb81340..2c20940423 100644
      );
    }
 diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
-index 666c190067..b6c3761f6f 100644
+index a58b75c009..02da0daeb7 100644
 --- a/packages/flutter_tools/lib/src/commands/downgrade.dart
 +++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
-@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
+@@ -120,7 +120,7 @@ class DowngradeCommand extends FlutterCommand {
      // Detect unknown versions.
      final ProcessUtils processUtils = _processUtils!;
      final RunResult parseResult = await processUtils.run(<String>[
@@ -24,7 +24,7 @@ index 666c190067..b6c3761f6f 100644
      ], workingDirectory: workingDirectory);
      if (parseResult.exitCode != 0) {
        throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}');
-@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand {
+@@ -192,7 +192,7 @@ class DowngradeCommand extends FlutterCommand {
          continue;
        }
        final RunResult parseResult = await _processUtils!.run(<String>[
@@ -34,55 +34,37 @@ index 666c190067..b6c3761f6f 100644
        if (parseResult.exitCode == 0) {
          buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
 diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
-index dc47f17057..8068e2d1f5 100644
+index 0702b35e7e..36b2a95b65 100644
 --- a/packages/flutter_tools/lib/src/version.dart
 +++ b/packages/flutter_tools/lib/src/version.dart
-@@ -111,7 +111,7 @@ class FlutterVersion {
-     String? channel = _channel;
-     if (channel == null) {
+@@ -407,7 +407,7 @@ abstract class FlutterVersion {
+   /// wrapper that does that.
+   @visibleForTesting
+   static List<String> gitLog(List<String> args) {
+-    return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
++    return <String>['git', '--git-dir','.git', '-c', 'log.showSignature=false', 'log'] + args;
+   }
+ }
+ 
+@@ -559,7 +559,7 @@ class _FlutterVersionGit extends FlutterVersion {
+   String? get repositoryUrl {
+     if (_repositoryUrl == null) {
        final String gitChannel = _runGit(
 -        'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
 +        'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
          globals.processUtils,
-         _workingDirectory,
+         flutterRoot,
        );
-@@ -119,7 +119,7 @@ class FlutterVersion {
+@@ -567,7 +567,7 @@ class _FlutterVersionGit extends FlutterVersion {
        if (slash != -1) {
          final String remote = gitChannel.substring(0, slash);
          _repositoryUrl = _runGit(
 -          'git ls-remote --get-url $remote',
 +          'git --git-dir .git ls-remote --get-url $remote',
            globals.processUtils,
-           _workingDirectory,
+           flutterRoot,
          );
-@@ -298,7 +298,7 @@ class FlutterVersion {
-   /// the branch name will be returned as `'[user-branch]'`.
-   String getBranchName({ bool redactUnknownBranches = false }) {
-     _branch ??= () {
--      final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
-+      final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
-       return branch == 'HEAD' ? channel : branch;
-     }();
-     if (redactUnknownBranches || _branch!.isEmpty) {
-@@ -331,7 +331,7 @@ class FlutterVersion {
-   /// wrapper that does that.
-   @visibleForTesting
-   static List<String> gitLog(List<String> args) {
--    return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
-+    return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
-   }
- 
-   /// Gets the release date of the latest available Flutter version.
-@@ -708,7 +708,7 @@ class GitTagVersion {
-     String gitRef = 'HEAD'
-   }) {
-     if (fetchTags) {
--      final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
-+      final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
-       if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
-         globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
-       } else {
-@@ -718,7 +718,7 @@ class GitTagVersion {
+@@ -952,7 +952,7 @@ class GitTagVersion {
      }
      // find all tags attached to the given [gitRef]
      final List<String> tags = _runGit(
@@ -91,7 +73,7 @@ index dc47f17057..8068e2d1f5 100644
  
      // Check first for a stable tag
      final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
-@@ -739,7 +739,7 @@ class GitTagVersion {
+@@ -973,7 +973,7 @@ class GitTagVersion {
      // recent tag and number of commits past.
      return parse(
        _runGit(

From 60c313e1439434c94eaf7a198835877d02a62910 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sun, 27 Aug 2023 23:11:24 +1000
Subject: [PATCH 23/43] flutter: Supply CA bundle in sandbox

(cherry picked from commit 41bbc2c311f10086fcb9f149d06eb300ab7e2a7d)
---
 .../dart/fetch-dart-deps/default.nix          |  8 ++++-
 pkgs/build-support/flutter/default.nix        | 21 ++++++++++++
 .../flutter3/flutter-pub-dart-override.patch  | 34 +++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch

diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix
index e523b60797eb..d6920a35e204 100644
--- a/pkgs/build-support/dart/fetch-dart-deps/default.nix
+++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix
@@ -79,7 +79,13 @@ let
 
       installPhase = ''
         _pub_get() {
-          ${pubGetScript}
+          (
+            # Dart does not respect SSL_CERT_FILE.
+            # https://github.com/dart-lang/sdk/issues/48506
+            export DART_VM_OPTIONS="--root-certs-file=$SSL_CERT_FILE"
+
+            ${pubGetScript}
+          )
         }
 
         # so we can use lock, diff yaml
diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix
index 8d31482900a8..06f6e2770be9 100644
--- a/pkgs/build-support/flutter/default.nix
+++ b/pkgs/build-support/flutter/default.nix
@@ -1,6 +1,7 @@
 { lib
 , callPackage
 , stdenvNoCC
+, runCommand
 , makeWrapper
 , llvmPackages_13
 , cacert
@@ -26,6 +27,26 @@
 }@args:
 let
   flutterSetupScript = ''
+    # Pub needs SSL certificates. Dart normally looks in a hardcoded path.
+    # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48
+    #
+    # Dart does not respect SSL_CERT_FILE...
+    # https://github.com/dart-lang/sdk/issues/48506
+    # ...and Flutter does not support --root-certs-file, so the path cannot be manually set.
+    # https://github.com/flutter/flutter/issues/56607
+    # https://github.com/flutter/flutter/issues/113594
+    #
+    # libredirect is of no use either, as Flutter does not pass any
+    # environment variables (including LD_PRELOAD) to the Pub process.
+    #
+    # Instead, Flutter is patched to allow the path to the Dart binary used for
+    # Pub commands to be overriden.
+    export NIX_FLUTTER_PUB_DART="${runCommand "dart-with-certs" { nativeBuildInputs = [ makeWrapper ]; } ''
+      mkdir -p "$out/bin"
+      makeWrapper ${flutter.dart}/bin/dart "$out/bin/dart" \
+        --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt"
+    ''}/bin/dart"
+
     export HOME="$NIX_BUILD_TOP"
     flutter config --no-analytics &>/dev/null # mute first-run
     flutter config --enable-linux-desktop >/dev/null
diff --git a/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch b/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch
new file mode 100644
index 000000000000..9d1de65c320d
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch
@@ -0,0 +1,34 @@
+From ddb81649092776ecac635af7040685588798b5a5 Mon Sep 17 00:00:00 2001
+From: hacker1024 <hacker1024@users.sourceforge.net>
+Date: Sun, 27 Aug 2023 22:47:24 +1000
+Subject: [PATCH] Allow replacing the Dart binary used for Pub commands with
+ NIX_FLUTTER_PUB_DART
+
+---
+ packages/flutter_tools/lib/src/dart/pub.dart | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart
+index 40e60f9005..22fd3cebc7 100644
+--- a/packages/flutter_tools/lib/src/dart/pub.dart
++++ b/packages/flutter_tools/lib/src/dart/pub.dart
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+ 
+ import 'dart:async';
++import 'dart:io' as io;
+ 
+ import 'package:meta/meta.dart';
+ import 'package:package_config/package_config.dart';
+@@ -544,7 +545,7 @@ class _DefaultPub implements Pub {
+ 
+   List<String> _computePubCommand() {
+     // TODO(zanderso): refactor to use artifacts.
+-    final String sdkPath = _fileSystem.path.joinAll(<String>[
++    final String sdkPath = io.Platform.environment['NIX_FLUTTER_PUB_DART'] ?? _fileSystem.path.joinAll(<String>[
+       Cache.flutterRoot!,
+       'bin',
+       'cache',
+-- 
+2.41.0
+

From 012597b62e9c472be9da36c6107f81fc4e018800 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Mon, 18 Sep 2023 20:27:18 +0200
Subject: [PATCH 24/43] flutter: 3.13.0 -> 3.13.4

(cherry picked from commit c511f60c4845468b112c0ce082edbfd63a797c9d)
---
 .../development/compilers/flutter/default.nix |  20 +--
 .../flutter/engine-artifacts/hashes.nix       | 116 ++++++++++++++++++
 2 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index e23d5b9b3b8e..e40767cabf9c 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -75,20 +75,20 @@ in
 {
   inherit wrapFlutter;
   stable = mkFlutter {
-    version = "3.13.0";
-    engineVersion = "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952";
-    dartVersion = "3.1.0";
+    version = "3.13.4";
+    engineVersion = "9064459a8b0dcd32877107f6002cc429a71659d1";
+    dartVersion = "3.1.2";
     dartHash = {
-      x86_64-linux = "sha256-sGpRyuUTkZ0cpG/O21NCHaOsQRjNklsl9G6Ia1tZxAw=";
-      aarch64-linux = "sha256-wcDtL/Lh0NFC01QlnKwx8ovTHZ5ww+rb1sELn92R1uU=";
-      x86_64-darwin = "sha256-h+e7ABlLWCxc6wrbjiy5lgp6O/DnNKdXFNJtgnXBZNA=";
-      aarch64-darwin = "sha256-sAWnd09mbcRLP0WjSjjWF7+WQ7LP3tWsq5Kqw8e4APg=";
+      x86_64-linux = "sha256-kriMqIvS/ZPhCR+hDTZReW4MMBYCVzSO9xTuPrJ1cPg=";
+      aarch64-linux = "sha256-Fvg9Rr9Z7LYz8MjyzVCZwCzDiWPLDvH8vgD0oDZTksw=";
+      x86_64-darwin = "sha256-WL42AYjT2iriVP05Pm7288um+oFwS8o8gU5tCwSOvUM=";
+      aarch64-darwin = "sha256-0xw8/u83IWnEtwnNGLHGvEhGg/3pTNnJbFTR5TyuIxY=";
     };
     flutterHash = rec {
-      x86_64-linux = "sha256-gXNQ9RuHVC/3puHNygWPRdezx8iiKmiOnxQmoX6XUFo=";
+      x86_64-linux = "sha256-BPEmO4c3H2bOa+sBAVDz5/qvajobK3YMnBfQWhJUydw=";
       aarch64-linux = x86_64-linux;
-      x86_64-darwin = "sha256-vI8TsXIfTg4PYf5dzxDaJt+PIdmVFBmd2slKK7c1By0=";
-      aarch64-darwin = "sha256-VhGJlp+HG8QLZx8u0xK+cgbneoDM7zhNvm3Oco4nBms=";
+      x86_64-darwin = "sha256-BpxeCE9vTnmlIp6OS7BTPkOFptidjXbf2qVOVUAqstY=";
+      aarch64-darwin = "sha256-rccuxrE9nzC86uKGL96Etxxs4qMbVXJ1jCn/wjp9WlQ=";
     };
     patches = flutter3Patches;
   };
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 786d77de9ace..5c2ab8eed7c9 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -487,4 +487,120 @@
       "linux-x64-flutter-gtk.zip" = "sha256-Hw/hAMohLko1AMu3sr4Dq5OwvmrBP2PPJcJRVMgy6B4=";
     };
   };
+  "9064459a8b0dcd32877107f6002cc429a71659d1" = {
+    skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
+    android-arm = {
+      "artifacts.zip" = "sha256-CG8YKRxduFWLAoBFU+dw6w48GN/S08G9Xp8BPbBJgQ4=";
+    };
+    android-arm-profile = {
+      "artifacts.zip" = "sha256-ea6u3FHw7VCdhG6L0g6xiwjartXEZe5V9J9ASXyI3Dg=";
+      "linux-x64.zip" = "sha256-1ubkrmcA0PbXurxSO8zpnCz+nYRjg3cjKIeixcNb4As=";
+      "darwin-x64.zip" = "sha256-Mgpq0rbxuvlmu9vhNUoxI760QH9MTw83lZ42L7d9Zyc=";
+    };
+    android-arm-release = {
+      "artifacts.zip" = "sha256-8pOFXKB/MmwE28OhZJ9fpIuG9UxPfQOemYsl5ol7rac=";
+      "linux-x64.zip" = "sha256-owhC8N3UxaxINB4JQn02E6utFoV+y2ZCthS6Ns9Opt8=";
+      "darwin-x64.zip" = "sha256-crC7k5ihohWkpUIHevK2qLtYdshJMLsa8DnwVEcW3gY=";
+    };
+    android-arm64 = {
+      "artifacts.zip" = "sha256-W9wF1jjKvJgnyCE9b0Btg2fRTA5RYTTPqYOXs7TMSwo=";
+    };
+    android-arm64-profile = {
+      "artifacts.zip" = "sha256-mddURAnP/n+0zty55Ecrs8rUA1awf/7WORAmRTWCyy8=";
+      "linux-x64.zip" = "sha256-hoDwl0wfthpTrqhaTijTSJapf1JNhhzm0NEdA0Ivie0=";
+      "darwin-x64.zip" = "sha256-xvfXQ1PlCABAzToQHsXq6BYPkHtD6sxxVabFYQ5kNsU=";
+    };
+    android-arm64-release = {
+      "artifacts.zip" = "sha256-FrbUiXR/HM0D5JYI1dkjt9mynclq/fzK2iKxIF7CELk=";
+      "linux-x64.zip" = "sha256-qXyqXpa6UkNSOFsT5ZrDsZMjvfxiggNlWH7YMMfgu1s=";
+      "darwin-x64.zip" = "sha256-6Hv0+96hut/XKyymEI40ivnDCOCXpNd7QMwHr6pPVvo=";
+    };
+    android-x64 = {
+      "artifacts.zip" = "sha256-sKX7Uny76RlCRxxaaWaW34uAqjGfaIdML/lHk0OsgnI=";
+    };
+    android-x64-profile = {
+      "artifacts.zip" = "sha256-Z9bAGfu+o3KXr/oPLNqoFZZiQCx4KmfMZ4Wi4KCDrP4=";
+      "linux-x64.zip" = "sha256-YsMB/Jfv139Dh+yBYZHqAq8m4F1lx7Foyiu/VJwHOPg=";
+      "darwin-x64.zip" = "sha256-6hzvlsbnPK/uVgK2SVviV9NZ8MuaYUYyyqGNKjzNRE8=";
+    };
+    android-x64-release = {
+      "artifacts.zip" = "sha256-Xp3Vdw0AiBOlyoj9Kdu+V9+mJiCGrtI0Vl0zaA5rsoA=";
+      "linux-x64.zip" = "sha256-snuFDsVbXwpskGWbCEH1iOtg02/6b21xstRtgpH5D40=";
+      "darwin-x64.zip" = "sha256-pvzmkLJA1K04kbN5Z6FInwxbIBZTS5UTArkkEQhvmkQ=";
+    };
+    android-x86 = {
+      "artifacts.zip" = "sha256-kLvafE0fIRibRcSQNiW52iZ/uus64kCgnaD8eaTLx6o=";
+    };
+    android-x86-jit-release = {
+      "artifacts.zip" = "sha256-+dVdO+VCXaB3W4JqLt4UmJVe5BfMYHW34iv5w9QRLoM=";
+    };
+    darwin-arm64 = {
+      "artifacts.zip" = "sha256-xGHDIJf54YldAtpmPxUXPzjW4fYl8SxlIH08RcG+kAE=";
+      "font-subset.zip" = "sha256-j9cFUBxwTolhMA+KiFaegHIpK7cF/K2R0ZLqRTeM1RY=";
+    };
+    darwin-arm64-profile = {
+      "artifacts.zip" = "sha256-YkhNF4igx0KpMGfrOvGq19GVfvTMA5AIkPq7Sx2945k=";
+    };
+    darwin-arm64-release = {
+      "artifacts.zip" = "sha256-ObUKx3ilpJXVk2Il7moJOKMn3ijCxhymp2zx7GbJSgo=";
+    };
+    darwin-x64 = {
+      "FlutterEmbedder.framework.zip" = "sha256-6ApkTiLh++bwgfYOGRoqnXglboqCWxc0VpNcYitjLLk=";
+      "FlutterMacOS.framework.zip" = "sha256-PP2E+PY1HB2OkX8a8/E/HpUBPRoDJyo/2BNUKd1Xd2s=";
+      "artifacts.zip" = "sha256-QEvLT4p3smyhUSyYoY0ODxWmPpR8r4cpbQIuCOwbnQ8=";
+      "font-subset.zip" = "sha256-j/QBo6o8nOsUOSpHvrF0EQdmkyrph4P67K3AJ5lB8iU=";
+      "gen_snapshot.zip" = "sha256-F74RoxN2/08bnTKo8T4hG8QSlzuvtnz50NONUdVvEtU=";
+    };
+    darwin-x64-profile = {
+      "FlutterMacOS.framework.zip" = "sha256-zDTey1dN4TYfi2/tDlxHPZhW3szZuGTMSaObNNH4zZo=";
+      "artifacts.zip" = "sha256-ZOAb/Q4mGxkw7G+LFnpBDW6B2OYvMOYLp4NY24zKIsE=";
+      "gen_snapshot.zip" = "sha256-apXAAqqv4EAJmaUiZ6/8BUe6wKkZVaRRvpiQ7BLQHZY=";
+    };
+    darwin-x64-release = {
+      "FlutterMacOS.dSYM.zip" = "sha256-wGETGsfyddpYn876747l3Osi1o//jeUG7yZKv8JuTJA=";
+      "FlutterMacOS.framework.zip" = "sha256-9rEkGe0iz51aVXtCXK+KolJqjNUOEMwjeRHdF6kBjPs=";
+      "artifacts.zip" = "sha256-5IEYvP4maXzBhz6wcm4BL3jPMyjogQeYZJGObQ9oP6c=";
+      "gen_snapshot.zip" = "sha256-yYLTa7XnFdZNE4hIzNm9ES2B5+hRcHBtboEUNwUJtfs=";
+    };
+    "flutter_patched_sdk.zip" = "sha256-SkuDdpWR0DD/JFU3T/buhULN53O8hXzmaoDRSNtJP/E=";
+    "flutter_patched_sdk_product.zip" = "sha256-VFr5UPvaV1nJ8h5wGGmlKuLH0AfzEkDGbVOagHgIFSM="
+    ;
+    ios = {
+      "artifacts.zip" = "sha256-XUNyJJYng0AH05P+lIYYgh3HQTKaYJWT7XyxKCWH5wU=";
+    };
+    ios-profile = {
+      "artifacts.zip" = "sha256-sP9Yqvkmw6/u1RmI1sd8bChO1IVPKM47tTnuH2KNmLc=";
+    };
+    ios-release = {
+      "Flutter.dSYM.zip" = "sha256-V0lm965ApbjUcNJqd6k21ToRkkZKNoRtqOu8oUs/us4=";
+      "artifacts.zip" = "sha256-19m8WlcZmua/hMjIN9zYIVwqSHaLZhlrhVRKQWm401k=";
+    };
+    linux-arm64 = {
+      "artifacts.zip" = "sha256-apE7/YFvhr6LdEFdtF8MIsrnPM1PebOSnL2o3jKYWcA=";
+      "font-subset.zip" = "sha256-NLL2Hy204FJIHBvthBx2oj+GaAIAKzL391qlov6Dm/A=";
+    };
+    linux-arm64-debug = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-d4IzQzbXnjo2YHVwzBWgUV4ODkmKqaXsYoiUHNbTdnY=";
+    };
+    linux-arm64-profile = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-DJ5tLosjhs99I19x3QwOmtDZvrwUdPJ3gQWyE5V+or0=";
+    };
+    linux-arm64-release = {
+      "linux-arm64-flutter-gtk.zip" = "sha256-95BY9N7dcVvloFzr3wocu4u8OrCLdK8/JhD0nwAwtc0=";
+    };
+    linux-x64 = {
+      "artifacts.zip" = "sha256-gSQ8eTfuton6goSLACagKrf/7Zq6UDruCZmeBsup5w4=";
+      "font-subset.zip" = "sha256-bd5X3VvVkDyPrSZbhuLpKzNyEwG/xNRZH9vxo0okALs=";
+    };
+    linux-x64-debug = {
+      "linux-x64-flutter-gtk.zip" = "sha256-BSnHxsIjbMbu+oIgIEXeevcZoGKPxXHBzy+PyfCIE0s=";
+    };
+    linux-x64-profile = {
+      "linux-x64-flutter-gtk.zip" = "sha256-04leXXe8sbDUn2cmXegsDmuOM2D9DjKGvc6WB3mDRDs=";
+    };
+    linux-x64-release = {
+      "linux-x64-flutter-gtk.zip" = "sha256-TXyB7O5iUAwtanNoYKjSHB3hPh7AMnGFxF2+zlRz9gU=";
+    };
+  };
 }

From a8709638062281fac4a4e4276a41a55fa2d8f225 Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Mon, 18 Sep 2023 20:27:18 +0200
Subject: [PATCH 25/43] flutter: 3.13.0 -> 3.13.4

(cherry picked from commit 64b86c1a1983f3714afbe468b6f6c838040bcfa9)
---
 .../development/compilers/flutter/default.nix |   2 +-
 .../flutter/engine-artifacts/hashes.nix       | 102 +++++++++---------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index e40767cabf9c..156b76be0a72 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -82,7 +82,7 @@ in
       x86_64-linux = "sha256-kriMqIvS/ZPhCR+hDTZReW4MMBYCVzSO9xTuPrJ1cPg=";
       aarch64-linux = "sha256-Fvg9Rr9Z7LYz8MjyzVCZwCzDiWPLDvH8vgD0oDZTksw=";
       x86_64-darwin = "sha256-WL42AYjT2iriVP05Pm7288um+oFwS8o8gU5tCwSOvUM=";
-      aarch64-darwin = "sha256-0xw8/u83IWnEtwnNGLHGvEhGg/3pTNnJbFTR5TyuIxY=";
+      aarch64-darwin = "sha256-BMbjSNJuh3RC+ObbJf2l6dacv2Hsn2/uygKDrP5EiuU=";
     };
     flutterHash = rec {
       x86_64-linux = "sha256-BPEmO4c3H2bOa+sBAVDz5/qvajobK3YMnBfQWhJUydw=";
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 5c2ab8eed7c9..60ea36dfaa3d 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -491,116 +491,116 @@
     skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY=";
     flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
-      "artifacts.zip" = "sha256-CG8YKRxduFWLAoBFU+dw6w48GN/S08G9Xp8BPbBJgQ4=";
+      "artifacts.zip" = "sha256-AABHJH/EOOQzEcD0O/XftA1AAV8tNFX3dj0OsJJ3/9A=";
     };
     android-arm-profile = {
-      "artifacts.zip" = "sha256-ea6u3FHw7VCdhG6L0g6xiwjartXEZe5V9J9ASXyI3Dg=";
-      "linux-x64.zip" = "sha256-1ubkrmcA0PbXurxSO8zpnCz+nYRjg3cjKIeixcNb4As=";
-      "darwin-x64.zip" = "sha256-Mgpq0rbxuvlmu9vhNUoxI760QH9MTw83lZ42L7d9Zyc=";
+      "artifacts.zip" = "sha256-MLlQFtjrGDQc3mH2T7CUlR/wDOPS7HRfgUuoLXjtd+E=";
+      "linux-x64.zip" = "sha256-S2/5ZFhNkDxUqsUZCFrwTERTUZIZpOiFijhcLZnozLI=";
+      "darwin-x64.zip" = "sha256-IwtYSpcg+5JmnkHuj6LGVp7GWiuUzETOPgKYRQczWzc=";
     };
     android-arm-release = {
-      "artifacts.zip" = "sha256-8pOFXKB/MmwE28OhZJ9fpIuG9UxPfQOemYsl5ol7rac=";
-      "linux-x64.zip" = "sha256-owhC8N3UxaxINB4JQn02E6utFoV+y2ZCthS6Ns9Opt8=";
-      "darwin-x64.zip" = "sha256-crC7k5ihohWkpUIHevK2qLtYdshJMLsa8DnwVEcW3gY=";
+      "artifacts.zip" = "sha256-NLvwaB4UkYBRzg4cxzNZkileDFQk6GT/8nRugHU98Is=";
+      "linux-x64.zip" = "sha256-dua4xvVqsJY1d/eyA8j6NPnpAbotigPIs8SRj28F87w=";
+      "darwin-x64.zip" = "sha256-2B1+s6sngbN0+sPP1qKVpeMF6RIZZToF88baiqcNQT4=";
     };
     android-arm64 = {
-      "artifacts.zip" = "sha256-W9wF1jjKvJgnyCE9b0Btg2fRTA5RYTTPqYOXs7TMSwo=";
+      "artifacts.zip" = "sha256-Hf+S8XuAzD9HCU4FVmjN0jvTTxPtzEm+k++8IgaXOyM=";
     };
     android-arm64-profile = {
-      "artifacts.zip" = "sha256-mddURAnP/n+0zty55Ecrs8rUA1awf/7WORAmRTWCyy8=";
-      "linux-x64.zip" = "sha256-hoDwl0wfthpTrqhaTijTSJapf1JNhhzm0NEdA0Ivie0=";
-      "darwin-x64.zip" = "sha256-xvfXQ1PlCABAzToQHsXq6BYPkHtD6sxxVabFYQ5kNsU=";
+      "artifacts.zip" = "sha256-k4miTzdDL+gg9LxzjBVRtAuwhKELBiVDsvQ+aVeWTeI=";
+      "linux-x64.zip" = "sha256-2ErIxNdX1NfHrjiqZzNwISKybeS9SGOlqFh7G8KCAcE=";
+      "darwin-x64.zip" = "sha256-1FdvI6llPjAeSc7+e97rvG7SvvFHqZH+4MREuRyF1DA=";
     };
     android-arm64-release = {
-      "artifacts.zip" = "sha256-FrbUiXR/HM0D5JYI1dkjt9mynclq/fzK2iKxIF7CELk=";
-      "linux-x64.zip" = "sha256-qXyqXpa6UkNSOFsT5ZrDsZMjvfxiggNlWH7YMMfgu1s=";
-      "darwin-x64.zip" = "sha256-6Hv0+96hut/XKyymEI40ivnDCOCXpNd7QMwHr6pPVvo=";
+      "artifacts.zip" = "sha256-y64Xhi5QFirZadU+fW8MOpkEarq/KPoEmmo0XRYf3/E=";
+      "linux-x64.zip" = "sha256-8dKrP9wQ9hDHNNrz1ZiYLV6zeGB60ikyrRFS6xdu+4Q=";
+      "darwin-x64.zip" = "sha256-2/eyFFAAUnuDtDoVh6L5emRXaQ03kwNRf6yIceWX3eU=";
     };
     android-x64 = {
-      "artifacts.zip" = "sha256-sKX7Uny76RlCRxxaaWaW34uAqjGfaIdML/lHk0OsgnI=";
+      "artifacts.zip" = "sha256-b3AtOxad05vaXQzeCBtSf3G8ZiM0tOG0JRu4vbNtfgI=";
     };
     android-x64-profile = {
-      "artifacts.zip" = "sha256-Z9bAGfu+o3KXr/oPLNqoFZZiQCx4KmfMZ4Wi4KCDrP4=";
-      "linux-x64.zip" = "sha256-YsMB/Jfv139Dh+yBYZHqAq8m4F1lx7Foyiu/VJwHOPg=";
-      "darwin-x64.zip" = "sha256-6hzvlsbnPK/uVgK2SVviV9NZ8MuaYUYyyqGNKjzNRE8=";
+      "artifacts.zip" = "sha256-TVOtSjKc8WkvYsY+aK7OH9eTA/q7tmtnSdQArPWS2vM=";
+      "linux-x64.zip" = "sha256-IHv3TGI1Yvhoq1ehVyVUn3JtPTCFyEtxdysvr/SWFxY=";
+      "darwin-x64.zip" = "sha256-B4XooSrLRJh3XADfIAv/YBDCT/Mpg2di0oE4SZlU8I8=";
     };
     android-x64-release = {
-      "artifacts.zip" = "sha256-Xp3Vdw0AiBOlyoj9Kdu+V9+mJiCGrtI0Vl0zaA5rsoA=";
-      "linux-x64.zip" = "sha256-snuFDsVbXwpskGWbCEH1iOtg02/6b21xstRtgpH5D40=";
-      "darwin-x64.zip" = "sha256-pvzmkLJA1K04kbN5Z6FInwxbIBZTS5UTArkkEQhvmkQ=";
+      "artifacts.zip" = "sha256-EaImhQlUnG/zYHDROkdgQdGHD9AfDJULowS785aVoCM=";
+      "linux-x64.zip" = "sha256-ZBvtCVUNf0D1P1lz4vmIrhsn9hZmJZ5Tn65v9Wot6bk=";
+      "darwin-x64.zip" = "sha256-IbMANAKyz7uFG5oqOKMj0KTVhaCBryBKdobvgS9bOgI=";
     };
     android-x86 = {
-      "artifacts.zip" = "sha256-kLvafE0fIRibRcSQNiW52iZ/uus64kCgnaD8eaTLx6o=";
+      "artifacts.zip" = "sha256-ElFkaxlyLVbexdocyQ1AIKgfr93ol1EDyf+aFDt4I10=";
     };
     android-x86-jit-release = {
-      "artifacts.zip" = "sha256-+dVdO+VCXaB3W4JqLt4UmJVe5BfMYHW34iv5w9QRLoM=";
+      "artifacts.zip" = "sha256-ptrhyXrx8xGuRQYs8nBryzyDuCiIMsgMmqxi3kHXQ4s=";
     };
     darwin-arm64 = {
-      "artifacts.zip" = "sha256-xGHDIJf54YldAtpmPxUXPzjW4fYl8SxlIH08RcG+kAE=";
-      "font-subset.zip" = "sha256-j9cFUBxwTolhMA+KiFaegHIpK7cF/K2R0ZLqRTeM1RY=";
+      "artifacts.zip" = "sha256-nG23DmYeKoMJnuTPMnvouPHzK3XNKBrEIZ5zijiCoAg=";
+      "font-subset.zip" = "sha256-Kx3G5FmN2bVgIvYiQP9og8kgl28ZCXThpcmByAv+f6U=";
     };
     darwin-arm64-profile = {
-      "artifacts.zip" = "sha256-YkhNF4igx0KpMGfrOvGq19GVfvTMA5AIkPq7Sx2945k=";
+      "artifacts.zip" = "sha256-Uzg5F2NPlVN/cui4ixJ3JxBttn0KQMEyKEVLmecssuU=";
     };
     darwin-arm64-release = {
-      "artifacts.zip" = "sha256-ObUKx3ilpJXVk2Il7moJOKMn3ijCxhymp2zx7GbJSgo=";
+      "artifacts.zip" = "sha256-qZ1jYvvkBcaIHqZszFTOcuCDWnEmm/vsJt2aSZvgO+s=";
     };
     darwin-x64 = {
       "FlutterEmbedder.framework.zip" = "sha256-6ApkTiLh++bwgfYOGRoqnXglboqCWxc0VpNcYitjLLk=";
       "FlutterMacOS.framework.zip" = "sha256-PP2E+PY1HB2OkX8a8/E/HpUBPRoDJyo/2BNUKd1Xd2s=";
-      "artifacts.zip" = "sha256-QEvLT4p3smyhUSyYoY0ODxWmPpR8r4cpbQIuCOwbnQ8=";
-      "font-subset.zip" = "sha256-j/QBo6o8nOsUOSpHvrF0EQdmkyrph4P67K3AJ5lB8iU=";
-      "gen_snapshot.zip" = "sha256-F74RoxN2/08bnTKo8T4hG8QSlzuvtnz50NONUdVvEtU=";
+      "artifacts.zip" = "sha256-aZf99m1KlIpEuwwMMWAksp9d/SQQXt8jOTs/6GJUhcw=";
+      "font-subset.zip" = "sha256-ZfdDnRPDOqNsj3dCHStLWXWCMOzodmR4ojQrMQt6hQY=";
+      "gen_snapshot.zip" = "sha256-1xi4EJsiOIJSaBSIhl7p4L0aWtLYR1vGz4yYzNdVuQw=";
     };
     darwin-x64-profile = {
       "FlutterMacOS.framework.zip" = "sha256-zDTey1dN4TYfi2/tDlxHPZhW3szZuGTMSaObNNH4zZo=";
-      "artifacts.zip" = "sha256-ZOAb/Q4mGxkw7G+LFnpBDW6B2OYvMOYLp4NY24zKIsE=";
-      "gen_snapshot.zip" = "sha256-apXAAqqv4EAJmaUiZ6/8BUe6wKkZVaRRvpiQ7BLQHZY=";
+      "artifacts.zip" = "sha256-kZ6io/+ohx5jKhu1i/l0UZbTB1gk6BSn1VryZJxPcjU=";
+      "gen_snapshot.zip" = "sha256-5AUul5CQ6A8YGb6/PAfbPH7G/c+9rElDftmL3WIi4ZQ=";
     };
     darwin-x64-release = {
-      "FlutterMacOS.dSYM.zip" = "sha256-wGETGsfyddpYn876747l3Osi1o//jeUG7yZKv8JuTJA=";
+      "FlutterMacOS.dSYM.zip" = "sha256-DN5R/U+pcCgFyR6wLcp11Bjvov4sS0J3crMWOx0dNBI=";
       "FlutterMacOS.framework.zip" = "sha256-9rEkGe0iz51aVXtCXK+KolJqjNUOEMwjeRHdF6kBjPs=";
-      "artifacts.zip" = "sha256-5IEYvP4maXzBhz6wcm4BL3jPMyjogQeYZJGObQ9oP6c=";
-      "gen_snapshot.zip" = "sha256-yYLTa7XnFdZNE4hIzNm9ES2B5+hRcHBtboEUNwUJtfs=";
+      "artifacts.zip" = "sha256-Lpz0WLAdspPybLhTnS2fsReTAZ0qkJmMvY+u8iCe53s=";
+      "gen_snapshot.zip" = "sha256-RLO5V6B/xzI5ljbIY7Yj4m1aFYYJ0PeO6nAyAN/ufnM=";
     };
-    "flutter_patched_sdk.zip" = "sha256-SkuDdpWR0DD/JFU3T/buhULN53O8hXzmaoDRSNtJP/E=";
-    "flutter_patched_sdk_product.zip" = "sha256-VFr5UPvaV1nJ8h5wGGmlKuLH0AfzEkDGbVOagHgIFSM="
+    "flutter_patched_sdk.zip" = "sha256-d1KBJex2XgFbM0GgtcMFGDG2MN00zPd5HyAP54vBIaw=";
+    "flutter_patched_sdk_product.zip" = "sha256-TG0OfcYQHy7Um1nl7xHXGl0oGGkna1tKSWhtnLTo2Ic="
     ;
     ios = {
-      "artifacts.zip" = "sha256-XUNyJJYng0AH05P+lIYYgh3HQTKaYJWT7XyxKCWH5wU=";
+      "artifacts.zip" = "sha256-bTtAJ4mrJZmT9IcDppfvm1ih3lNqJqywgatN3k48hoI=";
     };
     ios-profile = {
-      "artifacts.zip" = "sha256-sP9Yqvkmw6/u1RmI1sd8bChO1IVPKM47tTnuH2KNmLc=";
+      "artifacts.zip" = "sha256-4bqMbZ0ASURIRp6Zfs25Nww+5FasRqdXcppX2KSWK0g=";
     };
     ios-release = {
-      "Flutter.dSYM.zip" = "sha256-V0lm965ApbjUcNJqd6k21ToRkkZKNoRtqOu8oUs/us4=";
-      "artifacts.zip" = "sha256-19m8WlcZmua/hMjIN9zYIVwqSHaLZhlrhVRKQWm401k=";
+      "Flutter.dSYM.zip" = "sha256-LsYX9BTj9FXaW4f+7q6S/raZNx97FmGdJvegYrFiCAc=";
+      "artifacts.zip" = "sha256-KZBpNSeXCqfRydOdFzcaYdde3OCw7oI7x9/1l/4WlSk=";
     };
     linux-arm64 = {
-      "artifacts.zip" = "sha256-apE7/YFvhr6LdEFdtF8MIsrnPM1PebOSnL2o3jKYWcA=";
-      "font-subset.zip" = "sha256-NLL2Hy204FJIHBvthBx2oj+GaAIAKzL391qlov6Dm/A=";
+      "artifacts.zip" = "sha256-YBXe02wlxxpWT2pDUSILK/GXpKGx2vQo55E8zDOd4IQ=";
+      "font-subset.zip" = "sha256-02PHMUCPn6VBaQazfjEqVCGDPeGRXVTMXW8eAOuQRhY=";
     };
     linux-arm64-debug = {
-      "linux-arm64-flutter-gtk.zip" = "sha256-d4IzQzbXnjo2YHVwzBWgUV4ODkmKqaXsYoiUHNbTdnY=";
+      "linux-arm64-flutter-gtk.zip" = "sha256-ZTWenA3msfvFjoPA5ByX1/kXTDtd6H0H6i8AP2K9Zt8=";
     };
     linux-arm64-profile = {
-      "linux-arm64-flutter-gtk.zip" = "sha256-DJ5tLosjhs99I19x3QwOmtDZvrwUdPJ3gQWyE5V+or0=";
+      "linux-arm64-flutter-gtk.zip" = "sha256-CDXfWkg/WHT9A8EAzo78KiUI3uN1rZyvrPSDH5fyiQU=";
     };
     linux-arm64-release = {
-      "linux-arm64-flutter-gtk.zip" = "sha256-95BY9N7dcVvloFzr3wocu4u8OrCLdK8/JhD0nwAwtc0=";
+      "linux-arm64-flutter-gtk.zip" = "sha256-62dlbrqCj5mbIQXxMPzXTXHSJdJH4nao1a1c1WOSB1Y=";
     };
     linux-x64 = {
-      "artifacts.zip" = "sha256-gSQ8eTfuton6goSLACagKrf/7Zq6UDruCZmeBsup5w4=";
-      "font-subset.zip" = "sha256-bd5X3VvVkDyPrSZbhuLpKzNyEwG/xNRZH9vxo0okALs=";
+      "artifacts.zip" = "sha256-YVKajJeP6hFkLJk0HPIrEg/ig0tzkGj34z3ZA3VB8fE=";
+      "font-subset.zip" = "sha256-OFWcMnVi6AQoXKYcyMU8JN4/XM3OgSes0hzz8odTc8w=";
     };
     linux-x64-debug = {
-      "linux-x64-flutter-gtk.zip" = "sha256-BSnHxsIjbMbu+oIgIEXeevcZoGKPxXHBzy+PyfCIE0s=";
+      "linux-x64-flutter-gtk.zip" = "sha256-Z8xCDor+sBwXg63r0o7RudzoWj5AsAUkc53F6dvEsLY=";
     };
     linux-x64-profile = {
-      "linux-x64-flutter-gtk.zip" = "sha256-04leXXe8sbDUn2cmXegsDmuOM2D9DjKGvc6WB3mDRDs=";
+      "linux-x64-flutter-gtk.zip" = "sha256-x7n84R4y7/jH/rUbe86Gm0oLM5aLSTB2UjjeIpRJ1zQ=";
     };
     linux-x64-release = {
-      "linux-x64-flutter-gtk.zip" = "sha256-TXyB7O5iUAwtanNoYKjSHB3hPh7AMnGFxF2+zlRz9gU=";
+      "linux-x64-flutter-gtk.zip" = "sha256-B/Rtkln/rLS9M1gciXRnKvhPwR6bJrjGhrE9o1waamI=";
     };
   };
 }

From d5e3eb8e3b7da7e3928e2c3c57171a787b7fdb15 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sat, 26 Aug 2023 10:29:37 +0000
Subject: [PATCH 26/43] flutter: Pass through engineArtifacts in wrapper

(cherry picked from commit 0df5c9a81da7966e74da54a9952dabdd3134a6aa)
---
 pkgs/development/compilers/flutter/wrapper.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index a650b1853fd4..794876460f2f 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -175,6 +175,7 @@ in
   passthru = flutter.passthru // {
     inherit (flutter) version;
     unwrapped = flutter;
+    inherit engineArtifacts;
   };
 
   inherit (flutter) meta;

From d6161d0ab3849c68b9fff34107a55170a17ac96b Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Mon, 28 Aug 2023 11:59:44 +1000
Subject: [PATCH 27/43] flutter: Use wrapGAppsHook

Flutter's Linux desktop embedding uses GTK. wrapGAppsHook should be used.

(cherry picked from commit 84347c2195eb5a7df786b2fbe046d34fdfe716c4)
---
 pkgs/build-support/flutter/default.nix        |  7 +++
 .../development/compilers/flutter/wrapper.nix | 53 ++++++++++++-------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix
index 06f6e2770be9..90aa8381ec19 100644
--- a/pkgs/build-support/flutter/default.nix
+++ b/pkgs/build-support/flutter/default.nix
@@ -3,8 +3,10 @@
 , stdenvNoCC
 , runCommand
 , makeWrapper
+, wrapGAppsHook
 , llvmPackages_13
 , cacert
+, glib
 , flutter
 , jq
 }:
@@ -68,8 +70,12 @@ let
       deps
       flutter
       jq
+      glib
+      wrapGAppsHook
     ] ++ nativeBuildInputs;
 
+    dontWrapGApps = true;
+
     preUnpack = ''
       ${lib.optionalString (!autoDepsList) ''
         if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then
@@ -144,6 +150,7 @@ let
       for f in "$out"/bin/*; do
         wrapProgram "$f" \
           --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \
+          ''${gappsWrapperArgs[@]} \
           ${extraWrapProgramArgs}
       done
 
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 794876460f2f..47b64fe47401 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -33,6 +33,7 @@
 , makeWrapper
 , runCommandLocal
 , writeShellScript
+, wrapGAppsHook
 , git
 , which
 , pkg-config
@@ -166,31 +167,43 @@ let
   includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes);
   linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags;
 in
-(callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped"
+(callPackage ./sdk-symlink.nix { }) (stdenv.mkDerivation
 {
-  nativeBuildInputs = [
-    makeWrapper
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+  pname = "flutter-wrapped";
+  inherit (flutter) version;
+
+  nativeBuildInputs = [ makeWrapper ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]
+    ++ lib.optionals supportsLinuxDesktop [ glib wrapGAppsHook ];
 
   passthru = flutter.passthru // {
-    inherit (flutter) version;
     unwrapped = flutter;
     inherit engineArtifacts;
   };
 
-  inherit (flutter) meta;
-} ''
-  for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do
-    addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
-  done
+  dontUnpack = true;
+  dontWrapGApps = true;
 
-  mkdir -p $out/bin
-  makeWrapper '${immutableFlutter}' $out/bin/flutter \
-    --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
-    --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
-    --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
-    --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
-    --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
-    --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
-    --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}'
-'')
+  installPhase = ''
+    runHook preInstall
+
+    for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do
+      addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
+    done
+
+    mkdir -p $out/bin
+    makeWrapper '${immutableFlutter}' $out/bin/flutter \
+      --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
+      --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
+      --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
+      --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
+      --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
+      --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
+      --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \
+      ''${gappsWrapperArgs[@]}
+
+    runHook postInstall
+  '';
+
+  inherit (flutter) meta;
+})

From dc3cde5c069c6faf275bdd2f966bc1821068c77c Mon Sep 17 00:00:00 2001
From: gilice <104317939+gilice@users.noreply.github.com>
Date: Tue, 20 Jun 2023 12:49:57 +0200
Subject: [PATCH 28/43] firmware-updater: unstable-2023-04-30 ->
 unstable-2023-06-20

(cherry picked from commit bc95815e9e793dc27ff9ab9cd9865550b992ea9f)
---
 .../firmware/firmware-updater/default.nix     |  12 +-
 .../linux/firmware/firmware-updater/deps.json | 187 ++++++-------
 .../firmware/firmware-updater/pubspec.lock    | 259 +++++++++---------
 3 files changed, 217 insertions(+), 241 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
index 54b370415bc0..3d9e5fde481e 100644
--- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
@@ -1,21 +1,21 @@
 { lib
-, flutter37
+, flutter
 , fetchFromGitHub
 }:
 
-flutter37.buildFlutterApplication {
+flutter.buildFlutterApplication {
   pname = "firmware-updater";
-  version = "unstable-2023-04-30";
+  version = "unstable-2023-06-20";
 
   pubspecLockFile = ./pubspec.lock;
   depsListFile = ./deps.json;
-  vendorHash = "sha256-cdMO+tr6kYiN5xKXa+uTMAcFf2C75F3wVPrn21G4QPQ=";
+  vendorHash = "sha256-+4Lu6yHH/Yhl58bxhsLanP5hyhXSg9LpCuG1ohAlM5g=";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "firmware-updater";
-    rev = "6e7dbdb64e344633ea62874b54ff3990bd3b8440";
-    sha256 = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA=";
+    rev = "49ebcad241ed4964f1547c8da408bef13a8b4c69";
+    sha256 = "sha256-1BGcpcIJV0jqrj3nA7FJg36lMqpl281NGOgWppDUFCI=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json
index a4ab4fa8652f..de6a6a9d65f4 100644
--- a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json
@@ -57,7 +57,7 @@
   },
   {
     "name": "test_api",
-    "version": "0.4.16",
+    "version": "0.5.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -75,14 +75,24 @@
   },
   {
     "name": "matcher",
-    "version": "0.12.13",
+    "version": "0.12.15",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
+      "async",
       "meta",
-      "stack_trace"
+      "stack_trace",
+      "term_glyph",
+      "test_api"
     ]
   },
+  {
+    "name": "term_glyph",
+    "version": "1.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "stack_trace",
     "version": "1.11.0",
@@ -94,23 +104,33 @@
   },
   {
     "name": "path",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "meta",
-    "version": "1.8.0",
+    "version": "1.9.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
   {
-    "name": "term_glyph",
-    "version": "1.2.1",
+    "name": "async",
+    "version": "2.11.0",
     "kind": "transitive",
     "source": "hosted",
+    "dependencies": [
+      "collection",
+      "meta"
+    ]
+  },
+  {
+    "name": "collection",
+    "version": "1.17.1",
+    "kind": "direct",
+    "source": "hosted",
     "dependencies": []
   },
   {
@@ -133,13 +153,6 @@
       "term_glyph"
     ]
   },
-  {
-    "name": "collection",
-    "version": "1.17.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": []
-  },
   {
     "name": "stream_channel",
     "version": "2.1.1",
@@ -149,16 +162,6 @@
       "async"
     ]
   },
-  {
-    "name": "async",
-    "version": "2.10.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection",
-      "meta"
-    ]
-  },
   {
     "name": "boolean_selector",
     "version": "2.1.1",
@@ -171,7 +174,7 @@
   },
   {
     "name": "source_gen",
-    "version": "1.2.7",
+    "version": "1.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -187,7 +190,7 @@
   },
   {
     "name": "yaml",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -198,7 +201,7 @@
   },
   {
     "name": "glob",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -221,7 +224,7 @@
   },
   {
     "name": "dart_style",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -234,7 +237,7 @@
   },
   {
     "name": "pub_semver",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -244,14 +247,14 @@
   },
   {
     "name": "args",
-    "version": "2.4.0",
+    "version": "2.4.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "analyzer",
-    "version": "5.11.1",
+    "version": "5.13.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -271,7 +274,7 @@
   },
   {
     "name": "watcher",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -290,7 +293,7 @@
   },
   {
     "name": "crypto",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -299,7 +302,7 @@
   },
   {
     "name": "typed_data",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -317,7 +320,7 @@
   },
   {
     "name": "_fe_analyzer_shared",
-    "version": "59.0.0",
+    "version": "61.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -326,7 +329,7 @@
   },
   {
     "name": "build",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -337,6 +340,7 @@
       "glob",
       "logging",
       "meta",
+      "package_config",
       "path"
     ]
   },
@@ -349,7 +353,7 @@
   },
   {
     "name": "code_builder",
-    "version": "4.4.0",
+    "version": "4.5.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -362,7 +366,7 @@
   },
   {
     "name": "built_value",
-    "version": "8.4.4",
+    "version": "8.6.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -388,7 +392,7 @@
   },
   {
     "name": "melos",
-    "version": "3.0.1",
+    "version": "3.1.0",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -418,7 +422,7 @@
   },
   {
     "name": "yaml_edit",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -490,7 +494,7 @@
   },
   {
     "name": "json_annotation",
-    "version": "4.8.0",
+    "version": "4.8.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -499,14 +503,13 @@
   },
   {
     "name": "http",
-    "version": "0.13.5",
+    "version": "0.13.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "async",
       "http_parser",
-      "meta",
-      "path"
+      "meta"
     ]
   },
   {
@@ -568,7 +571,7 @@
   },
   {
     "name": "graphs",
-    "version": "2.2.0",
+    "version": "2.3.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -584,7 +587,7 @@
   },
   {
     "name": "cli_util",
-    "version": "0.3.5",
+    "version": "0.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -620,13 +623,11 @@
       "flutter_test",
       "path",
       "vm_service",
-      "archive",
       "async",
       "boolean_selector",
       "characters",
       "clock",
       "collection",
-      "crypto",
       "fake_async",
       "file",
       "js",
@@ -640,18 +641,16 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "typed_data",
       "vector_math",
       "webdriver"
     ]
   },
   {
     "name": "webdriver",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "archive",
       "matcher",
       "path",
       "stack_trace",
@@ -665,16 +664,6 @@
     "source": "hosted",
     "dependencies": []
   },
-  {
-    "name": "archive",
-    "version": "3.3.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "crypto",
-      "path"
-    ]
-  },
   {
     "name": "vector_math",
     "version": "2.1.4",
@@ -691,7 +680,7 @@
   },
   {
     "name": "js",
-    "version": "0.6.5",
+    "version": "0.6.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -717,14 +706,14 @@
   },
   {
     "name": "characters",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "vm_service",
-    "version": "9.4.0",
+    "version": "11.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -792,13 +781,11 @@
       "meta",
       "vm_service",
       "webdriver",
-      "archive",
       "async",
       "boolean_selector",
       "characters",
       "clock",
       "collection",
-      "crypto",
       "js",
       "matcher",
       "material_color_utilities",
@@ -811,7 +798,6 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "typed_data",
       "vector_math"
     ]
   },
@@ -831,7 +817,7 @@
   },
   {
     "name": "freezed",
-    "version": "2.3.2",
+    "version": "2.3.5",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -871,7 +857,7 @@
   },
   {
     "name": "pubspec_parse",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -884,7 +870,7 @@
   },
   {
     "name": "checked_yaml",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -904,20 +890,20 @@
   },
   {
     "name": "lints",
-    "version": "2.0.1",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "build_runner",
-    "version": "2.3.3",
+    "version": "2.4.5",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
+      "analyzer",
       "args",
       "async",
-      "analyzer",
       "build",
       "build_config",
       "build_daemon",
@@ -980,7 +966,7 @@
   },
   {
     "name": "shelf_web_socket",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -991,7 +977,7 @@
   },
   {
     "name": "shelf",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1031,7 +1017,7 @@
   },
   {
     "name": "build_runner_core",
-    "version": "7.2.7",
+    "version": "7.2.8",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1078,7 +1064,7 @@
   },
   {
     "name": "build_daemon",
-    "version": "3.1.1",
+    "version": "4.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1110,7 +1096,7 @@
   },
   {
     "name": "yaru_window",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1123,7 +1109,7 @@
   },
   {
     "name": "yaru_window_web",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1134,7 +1120,7 @@
   },
   {
     "name": "yaru_window_platform_interface",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1169,7 +1155,7 @@
   },
   {
     "name": "yaru_window_manager",
-    "version": "0.1.0",
+    "version": "0.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1181,7 +1167,7 @@
   },
   {
     "name": "window_manager",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1201,7 +1187,7 @@
   },
   {
     "name": "yaru_window_linux",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1255,7 +1241,7 @@
   },
   {
     "name": "gtk",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1266,7 +1252,7 @@
   },
   {
     "name": "ffi",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -1294,7 +1280,7 @@
   },
   {
     "name": "xml",
-    "version": "6.2.2",
+    "version": "6.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1305,7 +1291,7 @@
   },
   {
     "name": "petitparser",
-    "version": "5.1.0",
+    "version": "5.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1324,7 +1310,7 @@
   },
   {
     "name": "ubuntu_service",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1334,7 +1320,7 @@
   },
   {
     "name": "get_it",
-    "version": "7.3.0",
+    "version": "7.6.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1344,9 +1330,9 @@
   },
   {
     "name": "ubuntu_logger",
-    "version": "0.0.1",
+    "version": "0.0.3",
     "kind": "direct",
-    "source": "git",
+    "source": "hosted",
     "dependencies": [
       "collection",
       "logging",
@@ -1369,11 +1355,12 @@
   },
   {
     "name": "intl",
-    "version": "0.17.0",
+    "version": "0.18.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "clock",
+      "meta",
       "path"
     ]
   },
@@ -1456,29 +1443,27 @@
   },
   {
     "name": "flutter_html",
-    "version": "3.0.0-alpha.6",
+    "version": "3.0.0-beta.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "html",
       "csslib",
       "collection",
-      "numerus",
+      "list_counter",
       "flutter"
     ]
   },
   {
-    "name": "numerus",
-    "version": "2.0.0",
+    "name": "list_counter",
+    "version": "1.0.2",
     "kind": "transitive",
     "source": "hosted",
-    "dependencies": [
-      "characters"
-    ]
+    "dependencies": []
   },
   {
     "name": "csslib",
-    "version": "0.17.2",
+    "version": "0.17.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1487,7 +1472,7 @@
   },
   {
     "name": "html",
-    "version": "0.15.2",
+    "version": "0.15.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
index 641ab9fd9778..f95c0a6ab34a 100644
--- a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "8880b4cfe7b5b17d57c052a5a3a8cc1d4f546261c7cc8fbd717bd53f48db0568"
+      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
       url: "https://pub.dev"
     source: hosted
-    version: "59.0.0"
+    version: "61.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: a89627f49b0e70e068130a36571409726b04dab12da7e5625941d2c8ec278b96
+      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
       url: "https://pub.dev"
     source: hosted
-    version: "5.11.1"
+    version: "5.13.0"
   ansi_styles:
     dependency: transitive
     description:
@@ -25,30 +25,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.2+1"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.2"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -61,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "43865b79fbb78532e4bff7c33087aa43b1d488c4fdef014eaef568af6d8016dc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   build_config:
     dependency: transitive
     description:
@@ -77,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169"
+      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "4.0.0"
   build_resolvers:
     dependency: transitive
     description:
@@ -93,18 +85,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.4.5"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
+      sha256: "30859c90e9ddaccc484f56303931f477b1f1ba2bab74aa32ed5d6ce15870f8cf"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.7"
+    version: "7.2.8"
   built_collection:
     dependency: transitive
     description:
@@ -117,18 +109,18 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
+      sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166"
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.4"
+    version: "8.6.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   charcode:
     dependency: transitive
     description:
@@ -141,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   cli_launcher:
     dependency: transitive
     description:
@@ -157,10 +149,10 @@ packages:
     dependency: transitive
     description:
       name: cli_util
-      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
+      sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.5"
+    version: "0.4.0"
   clock:
     dependency: transitive
     description:
@@ -173,18 +165,18 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.0"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
   conventional_commit:
     dependency: transitive
     description:
@@ -205,26 +197,26 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745
+      sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.2"
+    version: "0.17.3"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352"
+      sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   dbus:
     dependency: "direct main"
     description:
@@ -253,10 +245,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   file:
     dependency: "direct main"
     description:
@@ -287,10 +279,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_html
-      sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd"
+      sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0-alpha.6"
+    version: "3.0.0-beta.2"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -318,10 +310,10 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: e819441678f1679b719008ff2ff0ef045d66eed9f9ec81166ca0d9b02a187454
+      sha256: a9520490532087cf38bf3f7de478ab6ebeb5f68bb1eb2641546d92719b224445
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.5"
   freezed_annotation:
     dependency: "direct main"
     description:
@@ -356,34 +348,34 @@ packages:
     dependency: transitive
     description:
       name: get_it
-      sha256: f9982979e3d2f286a957c04d2c3a98f55b0f0a06ffd6c5c4abbb96f06937f463
+      sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468"
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.0"
+    version: "7.6.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.1"
   gtk:
     dependency: "direct main"
     description:
       name: gtk
-      sha256: "517560d6ec625c114cbdcde9223e5ee6418d30860377347ee1b0513399e7a3f5"
+      sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   handy_window:
     dependency: "direct main"
     description:
@@ -396,18 +388,18 @@ packages:
     dependency: transitive
     description:
       name: html
-      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.2"
+    version: "0.15.4"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "0.13.6"
   http_multi_server:
     dependency: transitive
     description:
@@ -433,10 +425,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
   io:
     dependency: transitive
     description:
@@ -449,26 +441,34 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.0"
+    version: "4.8.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.1"
+  list_counter:
+    dependency: transitive
+    description:
+      name: list_counter
+      sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   logging:
     dependency: transitive
     description:
@@ -489,10 +489,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
@@ -505,18 +505,18 @@ packages:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: "993ac467e7a36bd832a6cdabbe18a0487c30bc52b5cca14e476a824679ebdce0"
+      sha256: ccbb6ecd8bb3f08ae8f9ce22920d816bff325a98940c845eda0257cd395503ac
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   meta:
     dependency: "direct main"
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   mime:
     dependency: transitive
     description:
@@ -549,14 +549,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
-  numerus:
-    dependency: transitive
-    description:
-      name: numerus
-      sha256: "436759d84f233b40107d0cc31cfa92d24e0960afeb2e506be70926d4cddffd9e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
   package_config:
     dependency: transitive
     description:
@@ -569,18 +561,18 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "5.4.0"
   platform:
     dependency: transitive
     description:
@@ -633,10 +625,10 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pub_updater:
     dependency: transitive
     description:
@@ -657,10 +649,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
+      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
   quiver:
     dependency: transitive
     description:
@@ -689,18 +681,18 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -710,10 +702,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298
+      sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.7"
+    version: "1.3.2"
   source_span:
     dependency: transitive
     description:
@@ -774,10 +766,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   timing:
     dependency: transitive
     description:
@@ -790,27 +782,26 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   ubuntu_logger:
     dependency: "direct main"
     description:
-      path: "packages/ubuntu_logger"
-      ref: HEAD
-      resolved-ref: f4ea41813779aff3b4dfb6a1b6c1382d2fb3ce81
-      url: "https://github.com/canonical/ubuntu-flutter-plugins.git"
-    source: git
-    version: "0.0.1"
+      name: ubuntu_logger
+      sha256: f6d663e5b9c33e90a7a77a2f15b7f76e90be1dd98a94b6640d7bd74db262060f
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.3"
   ubuntu_service:
     dependency: "direct main"
     description:
       name: ubuntu_service
-      sha256: "79b81c146c9fb1aedefa4a6f63724405de3aba0f525afe39b72c513df04a8c13"
+      sha256: f90582494cddd4c7325637930497f38598a7ec567f4f86f88fe1ac40a53832a1
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.3"
   ubuntu_session:
     dependency: "direct main"
     description:
@@ -847,18 +838,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
+      sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.0"
+    version: "11.3.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   web_socket_channel:
     dependency: transitive
     description:
@@ -871,42 +862,42 @@ packages:
     dependency: transitive
     description:
       name: webdriver
-      sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841
+      sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   window_manager:
     dependency: transitive
     description:
       name: window_manager
-      sha256: "2b2572442b2a5178642730442dc625ac088244f5827b1f0811371b1b7485eb62"
+      sha256: "95096fede562cbb65f30d38b62d819a458f59ba9fe4a317f6cee669710f6676b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.2"
+    version: "0.3.4"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "6.3.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   yaml_edit:
     dependency: transitive
     description:
       name: yaml_edit
-      sha256: "0b968021754d8fbd3e9c83563b538ee417d88b2cc587606da5615546b7ee033b"
+      sha256: "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   yaru:
     dependency: "direct main"
     description:
@@ -951,42 +942,42 @@ packages:
     dependency: transitive
     description:
       name: yaru_window
-      sha256: "18b3df2922a068e5480048335e2585c134e29ac77baec19b26fa32851910bf2f"
+      sha256: "2effc86bfe7aae870384655c029e3bc36bf5dd32727474e502832a1edaeff75d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.2"
   yaru_window_linux:
     dependency: transitive
     description:
       name: yaru_window_linux
-      sha256: "356903ebcb70c34f732dbb66ac8b504adb8e92289cdd89da86bed8957f43de38"
+      sha256: "9a813227137d1aafbc786d6455edc24c5febd17d6da04fe7ba2109c02bb60e69"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.2"
   yaru_window_manager:
     dependency: transitive
     description:
       name: yaru_window_manager
-      sha256: a5ea9db86cbca6306fdf139245fcd84f0df1fed0aead3450d34a9fe7be4d3020
+      sha256: "2d358263d19ae6598df21d6d8c0d25e75c79a82f459b63b0013a13e395c48b23"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0"
+    version: "0.1.2"
   yaru_window_platform_interface:
     dependency: transitive
     description:
       name: yaru_window_platform_interface
-      sha256: "1a0256fc59cc46ad05de5840f01d548184ff900698c19dc24e6326c7911b0177"
+      sha256: "7845d7db91e1c1acbc0f8b2f9ba6082c00a98f06cabda1732bdb7c267edc5c89"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0"
+    version: "0.1.1"
   yaru_window_web:
     dependency: transitive
     description:
       name: yaru_window_web
-      sha256: "77dacaaade6c2b5f94cf45b80f60c69876d62db02490e50dd025ce297cfc09ed"
+      sha256: "3ff30758a330d7626d54643df0cca6c179782f401aba7752da9cc0d60c9a6f74"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.2"
+    version: "0.0.3"
 sdks:
-  dart: ">=2.19.0 <3.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"

From e81ec471394635dd7f9c08bcb7125888e9d3488d Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Mon, 28 Aug 2023 11:24:05 +1000
Subject: [PATCH 29/43] firmware-updater: unstable-2023-06-20 ->
 unstable-2023-09-17, upgrade to Flutter 3.13.0

(cherry picked from commit d5ef1bc8487e35f9755b5775bc4e0435c049543c)
---
 .../firmware/firmware-updater/default.nix     |  25 +-
 .../linux/firmware/firmware-updater/deps.json | 655 +++++++++++-------
 .../firmware/firmware-updater/pubspec.lock    | 224 ++++--
 3 files changed, 573 insertions(+), 331 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
index 3d9e5fde481e..460ac0ad17b4 100644
--- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix
@@ -1,24 +1,37 @@
 { lib
+, writeText
 , flutter
 , fetchFromGitHub
 }:
 
-flutter.buildFlutterApplication {
+flutter.buildFlutterApplication rec {
   pname = "firmware-updater";
-  version = "unstable-2023-06-20";
+  version = "unstable-2023-09-17";
 
   pubspecLockFile = ./pubspec.lock;
   depsListFile = ./deps.json;
-  vendorHash = "sha256-+4Lu6yHH/Yhl58bxhsLanP5hyhXSg9LpCuG1ohAlM5g=";
+  vendorHash = "sha256-5xd9ppnWleKVA69DJWVdY+rZziu4dQBCu16I0ivD8kE=";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "firmware-updater";
-    rev = "49ebcad241ed4964f1547c8da408bef13a8b4c69";
-    sha256 = "sha256-1BGcpcIJV0jqrj3nA7FJg36lMqpl281NGOgWppDUFCI=";
-    fetchSubmodules = true;
+    rev = "855999da8d3d0c9930e06f2d296d82b55aeff79e";
+    hash = "sha256-tIeEuHl+sCKd756NYPmxXiV1Sg2m9W0eGUtM/Iskeu8=";
   };
 
+  postPatch = ''
+    rm -f pubspec.lock
+    ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON {
+      dependency_overrides = {
+        yaru = "^1.1.0";
+        yaru_icons = "^2.2.1";
+        yaru_widgets = "^3.1.0";
+        mockito = "^5.4.2";
+        test_api = "^0.6.1";
+      };
+    })}" pubspec_overrides.yaml
+  '';
+
   meta = with lib; {
     description = "Firmware Updater for Linux";
     homepage = "https://github.com/canonical/firmware-updater";
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json
index de6a6a9d65f4..702ddfd8c093 100644
--- a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json
@@ -23,6 +23,7 @@
       "ubuntu_logger",
       "ubuntu_service",
       "ubuntu_session",
+      "ubuntu_test",
       "upower",
       "yaru",
       "yaru_colors",
@@ -34,12 +35,116 @@
       "freezed",
       "integration_test",
       "melos",
-      "mockito"
+      "mockito",
+      "test_api"
+    ]
+  },
+  {
+    "name": "test_api",
+    "version": "0.6.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "async",
+      "boolean_selector",
+      "collection",
+      "meta",
+      "source_span",
+      "stack_trace",
+      "stream_channel",
+      "string_scanner",
+      "term_glyph"
+    ]
+  },
+  {
+    "name": "term_glyph",
+    "version": "1.2.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "string_scanner",
+    "version": "1.2.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "source_span"
+    ]
+  },
+  {
+    "name": "source_span",
+    "version": "1.10.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "path",
+      "term_glyph"
+    ]
+  },
+  {
+    "name": "path",
+    "version": "1.8.3",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "collection",
+    "version": "1.17.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "stream_channel",
+    "version": "2.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "async"
+    ]
+  },
+  {
+    "name": "async",
+    "version": "2.11.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "meta"
+    ]
+  },
+  {
+    "name": "meta",
+    "version": "1.9.1",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "stack_trace",
+    "version": "1.11.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "path"
+    ]
+  },
+  {
+    "name": "boolean_selector",
+    "version": "2.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "source_span",
+      "string_scanner"
     ]
   },
   {
     "name": "mockito",
-    "version": "5.4.0",
+    "version": "5.4.2",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -55,126 +160,9 @@
       "test_api"
     ]
   },
-  {
-    "name": "test_api",
-    "version": "0.5.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "async",
-      "boolean_selector",
-      "collection",
-      "meta",
-      "source_span",
-      "stack_trace",
-      "stream_channel",
-      "string_scanner",
-      "term_glyph",
-      "matcher"
-    ]
-  },
-  {
-    "name": "matcher",
-    "version": "0.12.15",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "async",
-      "meta",
-      "stack_trace",
-      "term_glyph",
-      "test_api"
-    ]
-  },
-  {
-    "name": "term_glyph",
-    "version": "1.2.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "stack_trace",
-    "version": "1.11.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "path"
-    ]
-  },
-  {
-    "name": "path",
-    "version": "1.8.3",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "meta",
-    "version": "1.9.1",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "async",
-    "version": "2.11.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection",
-      "meta"
-    ]
-  },
-  {
-    "name": "collection",
-    "version": "1.17.1",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "string_scanner",
-    "version": "1.2.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "source_span"
-    ]
-  },
-  {
-    "name": "source_span",
-    "version": "1.9.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection",
-      "path",
-      "term_glyph"
-    ]
-  },
-  {
-    "name": "stream_channel",
-    "version": "2.1.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "async"
-    ]
-  },
-  {
-    "name": "boolean_selector",
-    "version": "2.1.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "source_span",
-      "string_scanner"
-    ]
-  },
   {
     "name": "source_gen",
-    "version": "1.3.2",
+    "version": "1.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -224,7 +212,7 @@
   },
   {
     "name": "dart_style",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -329,7 +317,7 @@
   },
   {
     "name": "build",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -351,6 +339,19 @@
     "source": "hosted",
     "dependencies": []
   },
+  {
+    "name": "matcher",
+    "version": "0.12.16",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "async",
+      "meta",
+      "stack_trace",
+      "term_glyph",
+      "test_api"
+    ]
+  },
   {
     "name": "code_builder",
     "version": "4.5.0",
@@ -366,7 +367,7 @@
   },
   {
     "name": "built_value",
-    "version": "8.6.1",
+    "version": "8.6.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -392,7 +393,7 @@
   },
   {
     "name": "melos",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -465,13 +466,14 @@
   },
   {
     "name": "pub_updater",
-    "version": "0.2.4",
+    "version": "0.3.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "http",
       "json_annotation",
-      "process"
+      "process",
+      "pub_semver"
     ]
   },
   {
@@ -503,7 +505,7 @@
   },
   {
     "name": "http",
-    "version": "0.13.6",
+    "version": "1.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -630,7 +632,6 @@
       "collection",
       "fake_async",
       "file",
-      "js",
       "matcher",
       "material_color_utilities",
       "meta",
@@ -642,6 +643,7 @@
       "term_glyph",
       "test_api",
       "vector_math",
+      "web",
       "webdriver"
     ]
   },
@@ -664,6 +666,13 @@
     "source": "hosted",
     "dependencies": []
   },
+  {
+    "name": "web",
+    "version": "0.1.4-beta",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "vector_math",
     "version": "2.1.4",
@@ -673,18 +682,11 @@
   },
   {
     "name": "material_color_utilities",
-    "version": "0.2.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "js",
-    "version": "0.6.7",
+    "version": "0.5.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "meta"
+      "collection"
     ]
   },
   {
@@ -713,7 +715,7 @@
   },
   {
     "name": "vm_service",
-    "version": "11.3.0",
+    "version": "11.7.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -726,6 +728,7 @@
     "dependencies": [
       "flutter",
       "test_api",
+      "matcher",
       "path",
       "fake_async",
       "clock",
@@ -735,14 +738,13 @@
       "boolean_selector",
       "characters",
       "collection",
-      "js",
-      "matcher",
       "material_color_utilities",
       "meta",
       "source_span",
       "stream_channel",
       "string_scanner",
-      "term_glyph"
+      "term_glyph",
+      "web"
     ]
   },
   {
@@ -753,10 +755,10 @@
     "dependencies": [
       "characters",
       "collection",
-      "js",
       "material_color_utilities",
       "meta",
       "vector_math",
+      "web",
       "sky_engine"
     ]
   },
@@ -786,7 +788,6 @@
       "characters",
       "clock",
       "collection",
-      "js",
       "matcher",
       "material_color_utilities",
       "platform",
@@ -798,7 +799,8 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {
@@ -817,7 +819,7 @@
   },
   {
     "name": "freezed",
-    "version": "2.3.5",
+    "version": "2.4.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -833,7 +835,7 @@
   },
   {
     "name": "freezed_annotation",
-    "version": "2.2.0",
+    "version": "2.4.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -881,7 +883,7 @@
   },
   {
     "name": "flutter_lints",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -897,7 +899,7 @@
   },
   {
     "name": "build_runner",
-    "version": "2.4.5",
+    "version": "2.4.6",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -996,6 +998,15 @@
     "source": "hosted",
     "dependencies": []
   },
+  {
+    "name": "js",
+    "version": "0.6.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta"
+    ]
+  },
   {
     "name": "http_multi_server",
     "version": "3.2.1",
@@ -1043,7 +1054,7 @@
   },
   {
     "name": "build_resolvers",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1054,8 +1065,8 @@
       "crypto",
       "graphs",
       "logging",
-      "path",
       "package_config",
+      "path",
       "pool",
       "pub_semver",
       "stream_transform",
@@ -1083,20 +1094,19 @@
   },
   {
     "name": "yaru_widgets",
-    "version": "2.3.1",
+    "version": "3.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
       "yaru",
-      "yaru_colors",
       "yaru_icons",
       "yaru_window"
     ]
   },
   {
     "name": "yaru_window",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1120,7 +1130,7 @@
   },
   {
     "name": "yaru_window_platform_interface",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1131,7 +1141,7 @@
   },
   {
     "name": "plugin_platform_interface",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1145,12 +1155,12 @@
     "source": "sdk",
     "dependencies": [
       "flutter",
-      "js",
       "characters",
       "collection",
       "material_color_utilities",
       "meta",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {
@@ -1167,7 +1177,7 @@
   },
   {
     "name": "window_manager",
-    "version": "0.3.4",
+    "version": "0.3.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1178,7 +1188,7 @@
   },
   {
     "name": "screen_retriever",
-    "version": "0.1.6",
+    "version": "0.1.9",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1187,7 +1197,7 @@
   },
   {
     "name": "yaru_window_linux",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1197,13 +1207,43 @@
   },
   {
     "name": "yaru_icons",
-    "version": "1.0.4",
+    "version": "2.2.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter"
     ]
   },
+  {
+    "name": "yaru",
+    "version": "1.1.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "flutter",
+      "gtk",
+      "platform"
+    ]
+  },
+  {
+    "name": "gtk",
+    "version": "2.1.0",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "flutter",
+      "meta"
+    ]
+  },
+  {
+    "name": "ffi",
+    "version": "2.1.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "yaru_colors",
     "version": "0.1.7",
@@ -1226,37 +1266,6 @@
       "meta"
     ]
   },
-  {
-    "name": "yaru",
-    "version": "0.6.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "collection",
-      "flutter",
-      "gtk",
-      "platform",
-      "yaru_colors"
-    ]
-  },
-  {
-    "name": "gtk",
-    "version": "2.1.0",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "flutter",
-      "meta"
-    ]
-  },
-  {
-    "name": "ffi",
-    "version": "2.0.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
   {
     "name": "upower",
     "version": "0.7.0",
@@ -1298,6 +1307,198 @@
       "meta"
     ]
   },
+  {
+    "name": "ubuntu_test",
+    "version": "0.1.0-beta.6",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_html",
+      "flutter_markdown",
+      "flutter_svg",
+      "flutter_test",
+      "mockito",
+      "test_api",
+      "ubuntu_localizations",
+      "yaru_test"
+    ]
+  },
+  {
+    "name": "yaru_test",
+    "version": "0.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_test",
+      "yaru",
+      "yaru_widgets",
+      "yaru_window_platform_interface"
+    ]
+  },
+  {
+    "name": "ubuntu_localizations",
+    "version": "0.3.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "diacritic",
+      "flutter",
+      "flutter_localizations",
+      "intl"
+    ]
+  },
+  {
+    "name": "intl",
+    "version": "0.18.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "clock",
+      "meta",
+      "path"
+    ]
+  },
+  {
+    "name": "flutter_localizations",
+    "version": "0.0.0",
+    "kind": "direct",
+    "source": "sdk",
+    "dependencies": [
+      "flutter",
+      "intl",
+      "characters",
+      "clock",
+      "collection",
+      "material_color_utilities",
+      "meta",
+      "path",
+      "vector_math",
+      "web"
+    ]
+  },
+  {
+    "name": "diacritic",
+    "version": "0.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "flutter_svg",
+    "version": "2.0.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "vector_graphics",
+      "vector_graphics_codec",
+      "vector_graphics_compiler"
+    ]
+  },
+  {
+    "name": "vector_graphics_compiler",
+    "version": "1.1.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "args",
+      "meta",
+      "path_parsing",
+      "xml",
+      "vector_graphics_codec"
+    ]
+  },
+  {
+    "name": "vector_graphics_codec",
+    "version": "1.1.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "path_parsing",
+    "version": "1.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "vector_math",
+      "meta"
+    ]
+  },
+  {
+    "name": "vector_graphics",
+    "version": "1.1.7",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "vector_graphics_codec"
+    ]
+  },
+  {
+    "name": "flutter_markdown",
+    "version": "0.6.17+1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "markdown",
+      "meta",
+      "path"
+    ]
+  },
+  {
+    "name": "markdown",
+    "version": "7.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "args",
+      "meta"
+    ]
+  },
+  {
+    "name": "flutter_html",
+    "version": "3.0.0-beta.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "html",
+      "csslib",
+      "collection",
+      "list_counter",
+      "flutter"
+    ]
+  },
+  {
+    "name": "list_counter",
+    "version": "1.0.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "csslib",
+    "version": "0.17.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "source_span"
+    ]
+  },
+  {
+    "name": "html",
+    "version": "0.15.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "csslib",
+      "source_span"
+    ]
+  },
   {
     "name": "ubuntu_session",
     "version": "0.0.4",
@@ -1310,7 +1511,7 @@
   },
   {
     "name": "ubuntu_service",
-    "version": "0.2.3",
+    "version": "0.2.4",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1353,17 +1554,6 @@
       "clock"
     ]
   },
-  {
-    "name": "intl",
-    "version": "0.18.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "clock",
-      "meta",
-      "path"
-    ]
-  },
   {
     "name": "dio",
     "version": "4.0.6",
@@ -1422,62 +1612,5 @@
       "dbus",
       "meta"
     ]
-  },
-  {
-    "name": "flutter_localizations",
-    "version": "0.0.0",
-    "kind": "direct",
-    "source": "sdk",
-    "dependencies": [
-      "flutter",
-      "intl",
-      "characters",
-      "clock",
-      "collection",
-      "js",
-      "material_color_utilities",
-      "meta",
-      "path",
-      "vector_math"
-    ]
-  },
-  {
-    "name": "flutter_html",
-    "version": "3.0.0-beta.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "html",
-      "csslib",
-      "collection",
-      "list_counter",
-      "flutter"
-    ]
-  },
-  {
-    "name": "list_counter",
-    "version": "1.0.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "csslib",
-    "version": "0.17.3",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "source_span"
-    ]
-  },
-  {
-    "name": "html",
-    "version": "0.15.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "csslib",
-      "source_span"
-    ]
   }
 ]
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
index f95c0a6ab34a..99d5d74560b7 100644
--- a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
+++ b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "43865b79fbb78532e4bff7c33087aa43b1d488c4fdef014eaef568af6d8016dc"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -77,18 +77,18 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95
+      sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37"
+      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "2.4.6"
   build_runner_core:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166"
+      sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf
       url: "https://pub.dev"
     source: hosted
-    version: "8.6.1"
+    version: "8.6.2"
   characters:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   conventional_commit:
     dependency: transitive
     description:
@@ -213,10 +213,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad
+      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   dbus:
     dependency: "direct main"
     description:
@@ -225,6 +225,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.8"
+  diacritic:
+    dependency: transitive
+    description:
+      name: diacritic
+      sha256: a84e03ec2779375fb86430dbe9d8fba62c68376f2499097a5f6e75556babe706
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4"
   dio:
     dependency: "direct main"
     description:
@@ -245,10 +253,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   file:
     dependency: "direct main"
     description:
@@ -287,15 +295,31 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_markdown:
+    dependency: transitive
+    description:
+      name: flutter_markdown
+      sha256: "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.17+1"
+  flutter_svg:
+    dependency: transitive
+    description:
+      name: flutter_svg
+      sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.7"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -310,18 +334,18 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: a9520490532087cf38bf3f7de478ab6ebeb5f68bb1eb2641546d92719b224445
+      sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.1"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338
+      sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.4.1"
   frontend_server_client:
     dependency: transitive
     description:
@@ -396,10 +420,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "1.1.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -425,10 +449,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.0"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
@@ -485,30 +509,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.1.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   melos:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: ccbb6ecd8bb3f08ae8f9ce22920d816bff325a98940c845eda0257cd395503ac
+      sha256: "3f22f6cc629d72acf3acc8a7f8563384550290fa30790efa328c9cf606aa17d7"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   meta:
     dependency: "direct main"
     description:
@@ -529,10 +561,10 @@ packages:
     dependency: "direct dev"
     description:
       name: mockito
-      sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059
+      sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.4.2"
   mustache_template:
     dependency: transitive
     description:
@@ -565,6 +597,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   petitparser:
     dependency: transitive
     description:
@@ -585,10 +625,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   pool:
     dependency: transitive
     description:
@@ -633,10 +673,10 @@ packages:
     dependency: transitive
     description:
       name: pub_updater
-      sha256: "42890302ab2672adf567dc2b20e55b4ecc29d7e19c63b6b98143ab68dd717d3a"
+      sha256: b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.4"
+    version: "0.3.1"
   pubspec:
     dependency: transitive
     description:
@@ -673,10 +713,10 @@ packages:
     dependency: transitive
     description:
       name: screen_retriever
-      sha256: "4931f226ca158123ccd765325e9fbf360bfed0af9b460a10f960f9bb13d58323"
+      sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.6"
+    version: "0.1.9"
   shelf:
     dependency: transitive
     description:
@@ -702,18 +742,18 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33"
+      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -763,13 +803,13 @@ packages:
     source: hosted
     version: "1.2.1"
   test_api:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.1"
   timing:
     dependency: transitive
     description:
@@ -786,6 +826,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
+  ubuntu_localizations:
+    dependency: transitive
+    description:
+      name: ubuntu_localizations
+      sha256: a75e87b9f1c3dc678f69a943eb4cee8ccbd5b0db64d491750325950e311adab0
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.4"
   ubuntu_logger:
     dependency: "direct main"
     description:
@@ -798,10 +846,10 @@ packages:
     dependency: "direct main"
     description:
       name: ubuntu_service
-      sha256: f90582494cddd4c7325637930497f38598a7ec567f4f86f88fe1ac40a53832a1
+      sha256: f6ad4dfb099af41e750c59aad00d67a96e22df00f4962d2e25d56ae3db78be49
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.3"
+    version: "0.2.4"
   ubuntu_session:
     dependency: "direct main"
     description:
@@ -810,6 +858,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.4"
+  ubuntu_test:
+    dependency: "direct main"
+    description:
+      name: ubuntu_test
+      sha256: "2361b741808a11d95c64a50666151d536133e75cade17b8feccca1e67364be88"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0-beta.6"
   upower:
     dependency: "direct main"
     description:
@@ -826,6 +882,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.7"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.7"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.7"
   vector_math:
     dependency: transitive
     description:
@@ -838,10 +918,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
+      sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
       url: "https://pub.dev"
     source: hosted
-    version: "11.3.0"
+    version: "11.7.1"
   watcher:
     dependency: transitive
     description:
@@ -850,6 +930,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
   web_socket_channel:
     dependency: transitive
     description:
@@ -870,10 +958,10 @@ packages:
     dependency: transitive
     description:
       name: window_manager
-      sha256: "95096fede562cbb65f30d38b62d819a458f59ba9fe4a317f6cee669710f6676b"
+      sha256: "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.6"
   xml:
     dependency: transitive
     description:
@@ -902,10 +990,10 @@ packages:
     dependency: "direct main"
     description:
       name: yaru
-      sha256: "1d1fb60359a92f91cc7e6a76fd3046474b9734d2fb97b7a7189bb1e2ca66929f"
+      sha256: "24047f0de452784840a326874192d26cb5ebd8cf5eac7864086e5bc9272a28db"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.2"
+    version: "1.1.0"
   yaru_color_generator:
     dependency: transitive
     description:
@@ -926,34 +1014,42 @@ packages:
     dependency: "direct main"
     description:
       name: yaru_icons
-      sha256: "8ddd40522c882de898a493094f2f41687f7a0faaf3434b9c854a7605a53a2477"
+      sha256: cbb0b5945f407116fd8a1fbe7265e7ffa0d568249d496343a69cb5c55360bba1
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.2.1"
+  yaru_test:
+    dependency: transitive
+    description:
+      name: yaru_test
+      sha256: "9396269fbe026bb9c398b9d4308c76982090ddeca102e4846bd4ba595333ff0a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4"
   yaru_widgets:
     dependency: "direct main"
     description:
       name: yaru_widgets
-      sha256: "2fd284afe8c8c8104ea18b963d5db68f780ec65048be7ac0624d0dbb7176c55f"
+      sha256: "482a71ef5566c6cb4135272f0041bf8a9c35729bf9079b0d304eedfa2fa0cc0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "3.1.0"
   yaru_window:
     dependency: transitive
     description:
       name: yaru_window
-      sha256: "2effc86bfe7aae870384655c029e3bc36bf5dd32727474e502832a1edaeff75d"
+      sha256: "55c8f039d13aaa1b211a8cf0b7731ae2fdcac9b1be1e0994eb14ad1d17fecaf7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   yaru_window_linux:
     dependency: transitive
     description:
       name: yaru_window_linux
-      sha256: "9a813227137d1aafbc786d6455edc24c5febd17d6da04fe7ba2109c02bb60e69"
+      sha256: c45606cf75880ae6427bbe176dc5313356f16c876c7013a19aeee782882c40c2
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   yaru_window_manager:
     dependency: transitive
     description:
@@ -966,10 +1062,10 @@ packages:
     dependency: transitive
     description:
       name: yaru_window_platform_interface
-      sha256: "7845d7db91e1c1acbc0f8b2f9ba6082c00a98f06cabda1732bdb7c267edc5c89"
+      sha256: e9f8cd34e207d7f7b771ae70dee347ed974cee06b981819c4181b3e474e52254
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.2"
   yaru_window_web:
     dependency: transitive
     description:
@@ -979,5 +1075,5 @@ packages:
     source: hosted
     version: "0.0.3"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.10.0"

From d4f5aa76e86fb26c764d66688748730c1e756da8 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 8 May 2023 14:30:45 +0200
Subject: [PATCH 30/43] yubioath-flutter: 6.1.0 -> 6.2.0

(cherry picked from commit 3a034cb60a9cd9fc8711b0c6f89183ca5efa6c30)
---
 pkgs/applications/misc/yubioath-flutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index d98021bf6e2e..7a619c4573dd 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -10,13 +10,13 @@
 
 flutter37.buildFlutterApplication rec {
   pname = "yubioath-flutter";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubioath-flutter";
     rev = version;
-    sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI=";
+    hash = "sha256-NgzijuvyWNl9sFQzq1Jzk1povF8c/rKuVyVKeve+Vic=";
   };
 
   passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };

From 5b19ec4440a8adfa366d5cfe3a5cbb82059a2051 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 9 May 2023 11:28:33 +0200
Subject: [PATCH 31/43] yubioath-flutter: Relax python deps in helper

(cherry picked from commit 91f441cf77e4495bf26bb35c12ac91f350473bbc)
---
 pkgs/applications/misc/yubioath-flutter/helper.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix
index 2c188d833af6..b684d5360721 100644
--- a/pkgs/applications/misc/yubioath-flutter/helper.nix
+++ b/pkgs/applications/misc/yubioath-flutter/helper.nix
@@ -1,4 +1,5 @@
 { buildPythonApplication
+, python3
 , poetry-core
 , yubikey-manager
 , fido2
@@ -19,6 +20,12 @@ buildPythonApplication {
   sourceRoot = "source/helper";
   format = "pyproject";
 
+  nativeBuildInputs = [
+    python3.pkgs.pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [ "yubikey-manager" ];
+
   postPatch = ''
     sed -i \
       -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \

From cb1456138d9f8946f0bb3929c8d1d79e49e99698 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 13 Aug 2023 13:36:48 +0100
Subject: [PATCH 32/43] yubioath-flutter.helper: relax all dependencies

(cherry picked from commit 895889fffa4e6ab2be74ccdd01d0bc23615d6444)
---
 pkgs/applications/misc/yubioath-flutter/helper.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix
index b684d5360721..d55de31e02c8 100644
--- a/pkgs/applications/misc/yubioath-flutter/helper.nix
+++ b/pkgs/applications/misc/yubioath-flutter/helper.nix
@@ -24,15 +24,12 @@ buildPythonApplication {
     python3.pkgs.pythonRelaxDepsHook
   ];
 
-  pythonRelaxDeps = [ "yubikey-manager" ];
+  pythonRelaxDeps = true;
 
   postPatch = ''
-    sed -i \
-      -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \
-      -e 's,mss = .*,mss = "*",g' \
-      -e 's,yubikey-manager = .*,yubikey-manager = "*",g' \
-      -e 's,Pillow = .*,Pillow = "*",g' \
-      pyproject.toml
+    substituteInPlace pyproject.toml \
+      --replace "authenticator-helper" "yubioath-flutter-helper" \
+      --replace "0.1.0" "${version}"
   '';
 
   postInstall = ''

From 639f3dfccd9f8d117c1519d5daec48a059afc2c6 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 13 Aug 2023 13:37:37 +0100
Subject: [PATCH 33/43] yubioath-flutter: update deps and deps hash

(cherry picked from commit f802e332156140f5416a86ac92fd64a4e4f76842)
---
 .../misc/yubioath-flutter/default.nix         |   2 +-
 .../misc/yubioath-flutter/deps.json           | 459 ++++++++++++------
 2 files changed, 318 insertions(+), 143 deletions(-)

diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index 7a619c4573dd..77e90802949e 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -22,7 +22,7 @@ flutter37.buildFlutterApplication rec {
   passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8=";
+  vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA=";
 
   postPatch = ''
     substituteInPlace linux/CMakeLists.txt \
diff --git a/pkgs/applications/misc/yubioath-flutter/deps.json b/pkgs/applications/misc/yubioath-flutter/deps.json
index 1ce525f799bd..6d7414da346e 100644
--- a/pkgs/applications/misc/yubioath-flutter/deps.json
+++ b/pkgs/applications/misc/yubioath-flutter/deps.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "yubico_authenticator",
-    "version": "6.1.0+60100",
+    "version": "6.2.0+60200",
     "kind": "root",
     "source": "root",
     "dependencies": [
@@ -17,8 +17,18 @@
       "freezed_annotation",
       "window_manager",
       "qrscanner_zxing",
+      "screen_retriever",
       "desktop_drop",
       "url_launcher",
+      "path_provider",
+      "vector_graphics",
+      "vector_graphics_compiler",
+      "path",
+      "file_picker",
+      "archive",
+      "crypto",
+      "tray_manager",
+      "local_notifier",
       "integration_test",
       "flutter_test",
       "flutter_lints",
@@ -29,7 +39,7 @@
   },
   {
     "name": "json_serializable",
-    "version": "6.5.4",
+    "version": "6.6.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -60,7 +70,7 @@
   },
   {
     "name": "source_gen",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -69,7 +79,6 @@
       "build",
       "dart_style",
       "glob",
-      "meta",
       "path",
       "source_span",
       "yaml"
@@ -116,7 +125,7 @@
   {
     "name": "path",
     "version": "1.8.2",
-    "kind": "transitive",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
@@ -127,16 +136,9 @@
     "source": "hosted",
     "dependencies": []
   },
-  {
-    "name": "meta",
-    "version": "1.8.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
   {
     "name": "glob",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -157,6 +159,13 @@
       "path"
     ]
   },
+  {
+    "name": "meta",
+    "version": "1.8.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "async",
     "version": "2.10.0",
@@ -192,14 +201,14 @@
   },
   {
     "name": "args",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "analyzer",
-    "version": "5.2.0",
+    "version": "5.6.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -239,7 +248,7 @@
   {
     "name": "crypto",
     "version": "3.0.2",
-    "kind": "transitive",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "typed_data"
@@ -265,7 +274,7 @@
   },
   {
     "name": "_fe_analyzer_shared",
-    "version": "50.0.0",
+    "version": "54.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -290,7 +299,7 @@
   },
   {
     "name": "logging",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
@@ -310,7 +319,7 @@
   },
   {
     "name": "json_annotation",
-    "version": "4.7.0",
+    "version": "4.8.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -319,7 +328,7 @@
   },
   {
     "name": "checked_yaml",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -412,7 +421,7 @@
   },
   {
     "name": "web_socket_channel",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -432,7 +441,7 @@
   },
   {
     "name": "timing",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -504,7 +513,7 @@
   },
   {
     "name": "mime",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -520,7 +529,7 @@
   },
   {
     "name": "io",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -559,7 +568,7 @@
   },
   {
     "name": "code_builder",
-    "version": "4.3.0",
+    "version": "4.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -582,7 +591,7 @@
   },
   {
     "name": "built_value",
-    "version": "8.4.2",
+    "version": "8.4.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -594,7 +603,7 @@
   },
   {
     "name": "fixnum",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -634,13 +643,14 @@
   },
   {
     "name": "build_resolvers",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "analyzer",
       "async",
       "build",
+      "collection",
       "crypto",
       "graphs",
       "logging",
@@ -654,7 +664,7 @@
   },
   {
     "name": "build_daemon",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -861,7 +871,7 @@
   {
     "name": "archive",
     "version": "3.3.2",
-    "kind": "transitive",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "crypto",
@@ -945,44 +955,86 @@
     ]
   },
   {
-    "name": "url_launcher",
-    "version": "6.1.7",
+    "name": "local_notifier",
+    "version": "0.1.5",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "url_launcher_android",
-      "url_launcher_ios",
-      "url_launcher_linux",
-      "url_launcher_macos",
-      "url_launcher_platform_interface",
-      "url_launcher_web",
-      "url_launcher_windows"
+      "uuid"
     ]
   },
   {
-    "name": "url_launcher_windows",
-    "version": "3.0.1",
+    "name": "uuid",
+    "version": "3.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "flutter",
-      "url_launcher_platform_interface"
+      "crypto"
     ]
   },
   {
-    "name": "url_launcher_platform_interface",
-    "version": "2.1.1",
-    "kind": "transitive",
+    "name": "tray_manager",
+    "version": "0.2.0",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "plugin_platform_interface"
+      "menu_base",
+      "path",
+      "shortid"
     ]
   },
+  {
+    "name": "shortid",
+    "version": "0.1.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "menu_base",
+    "version": "0.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
+  {
+    "name": "file_picker",
+    "version": "5.2.7",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "flutter_plugin_android_lifecycle",
+      "plugin_platform_interface",
+      "ffi",
+      "path",
+      "win32"
+    ]
+  },
+  {
+    "name": "win32",
+    "version": "3.1.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi"
+    ]
+  },
+  {
+    "name": "ffi",
+    "version": "2.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "plugin_platform_interface",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -990,14 +1042,12 @@
     ]
   },
   {
-    "name": "url_launcher_web",
-    "version": "2.0.13",
+    "name": "flutter_plugin_android_lifecycle",
+    "version": "2.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "flutter",
-      "flutter_web_plugins",
-      "url_launcher_platform_interface"
+      "flutter"
     ]
   },
   {
@@ -1015,9 +1065,198 @@
       "vector_math"
     ]
   },
+  {
+    "name": "vector_graphics_compiler",
+    "version": "1.1.4",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "args",
+      "meta",
+      "path_parsing",
+      "xml",
+      "vector_graphics_codec"
+    ]
+  },
+  {
+    "name": "vector_graphics_codec",
+    "version": "1.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "xml",
+    "version": "6.2.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "meta",
+      "petitparser"
+    ]
+  },
+  {
+    "name": "petitparser",
+    "version": "5.1.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta"
+    ]
+  },
+  {
+    "name": "path_parsing",
+    "version": "1.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "vector_math",
+      "meta"
+    ]
+  },
+  {
+    "name": "vector_graphics",
+    "version": "1.1.4",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "vector_graphics_codec"
+    ]
+  },
+  {
+    "name": "path_provider",
+    "version": "2.0.14",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "path_provider_android",
+      "path_provider_foundation",
+      "path_provider_linux",
+      "path_provider_platform_interface",
+      "path_provider_windows"
+    ]
+  },
+  {
+    "name": "path_provider_windows",
+    "version": "2.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "flutter",
+      "path",
+      "path_provider_platform_interface",
+      "win32"
+    ]
+  },
+  {
+    "name": "path_provider_platform_interface",
+    "version": "2.0.6",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "platform",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "path_provider_linux",
+    "version": "2.1.9",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "flutter",
+      "path",
+      "path_provider_platform_interface",
+      "xdg_directories"
+    ]
+  },
+  {
+    "name": "xdg_directories",
+    "version": "1.0.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta",
+      "path",
+      "process"
+    ]
+  },
+  {
+    "name": "path_provider_foundation",
+    "version": "2.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "path_provider_platform_interface"
+    ]
+  },
+  {
+    "name": "path_provider_android",
+    "version": "2.0.22",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "path_provider_platform_interface"
+    ]
+  },
+  {
+    "name": "url_launcher",
+    "version": "6.1.10",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "url_launcher_android",
+      "url_launcher_ios",
+      "url_launcher_linux",
+      "url_launcher_macos",
+      "url_launcher_platform_interface",
+      "url_launcher_web",
+      "url_launcher_windows"
+    ]
+  },
+  {
+    "name": "url_launcher_windows",
+    "version": "3.0.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "url_launcher_platform_interface"
+    ]
+  },
+  {
+    "name": "url_launcher_platform_interface",
+    "version": "2.1.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "url_launcher_web",
+    "version": "2.0.15",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "url_launcher_platform_interface"
+    ]
+  },
   {
     "name": "url_launcher_macos",
-    "version": "3.0.1",
+    "version": "3.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1027,7 +1266,7 @@
   },
   {
     "name": "url_launcher_linux",
-    "version": "3.0.1",
+    "version": "3.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1037,7 +1276,7 @@
   },
   {
     "name": "url_launcher_ios",
-    "version": "6.0.17",
+    "version": "6.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1047,7 +1286,7 @@
   },
   {
     "name": "url_launcher_android",
-    "version": "6.0.22",
+    "version": "6.0.24",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1057,7 +1296,7 @@
   },
   {
     "name": "desktop_drop",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1068,7 +1307,7 @@
   },
   {
     "name": "cross_file",
-    "version": "0.3.3+2",
+    "version": "0.3.3+4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1076,6 +1315,15 @@
       "meta"
     ]
   },
+  {
+    "name": "screen_retriever",
+    "version": "0.1.6",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
   {
     "name": "qrscanner_zxing",
     "version": "1.0.0",
@@ -1088,7 +1336,7 @@
   },
   {
     "name": "window_manager",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1097,18 +1345,9 @@
       "screen_retriever"
     ]
   },
-  {
-    "name": "screen_retriever",
-    "version": "0.1.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
-    ]
-  },
   {
     "name": "flutter_riverpod",
-    "version": "2.1.3",
+    "version": "2.3.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1130,7 +1369,7 @@
   },
   {
     "name": "riverpod",
-    "version": "2.1.3",
+    "version": "2.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1142,7 +1381,7 @@
   },
   {
     "name": "shared_preferences",
-    "version": "2.0.16",
+    "version": "2.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1157,7 +1396,7 @@
   },
   {
     "name": "shared_preferences_windows",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1171,7 +1410,7 @@
   },
   {
     "name": "shared_preferences_platform_interface",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1179,49 +1418,9 @@
       "plugin_platform_interface"
     ]
   },
-  {
-    "name": "path_provider_windows",
-    "version": "2.1.3",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "flutter",
-      "path",
-      "path_provider_platform_interface",
-      "win32"
-    ]
-  },
-  {
-    "name": "win32",
-    "version": "3.1.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi"
-    ]
-  },
-  {
-    "name": "ffi",
-    "version": "2.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "path_provider_platform_interface",
-    "version": "2.0.5",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "platform",
-      "plugin_platform_interface"
-    ]
-  },
   {
     "name": "shared_preferences_web",
-    "version": "2.0.4",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1232,7 +1431,7 @@
   },
   {
     "name": "shared_preferences_linux",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1244,33 +1443,9 @@
       "shared_preferences_platform_interface"
     ]
   },
-  {
-    "name": "path_provider_linux",
-    "version": "2.1.7",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "flutter",
-      "path",
-      "path_provider_platform_interface",
-      "xdg_directories"
-    ]
-  },
-  {
-    "name": "xdg_directories",
-    "version": "0.2.0+2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "meta",
-      "path",
-      "process"
-    ]
-  },
   {
     "name": "shared_preferences_foundation",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1280,7 +1455,7 @@
   },
   {
     "name": "shared_preferences_android",
-    "version": "2.0.14",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [

From 8f81b18091c8cdfd198e3077e8c7ab3202cd3cf8 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 13 Aug 2023 13:37:49 +0100
Subject: [PATCH 34/43] yubioath-flutter: add libnotify and libappindicator
 dependencies

(cherry picked from commit 1bc43577f32c53bab984cbe9808a997125a7932b)
---
 pkgs/applications/misc/yubioath-flutter/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index 77e90802949e..326e03721ece 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -3,6 +3,9 @@
 , python3
 , fetchFromGitHub
 , pcre2
+, libnotify
+, libappindicator
+, pkg-config
 , gnome
 , makeWrapper
 , removeReferencesTo
@@ -68,10 +71,13 @@ flutter37.buildFlutterApplication rec {
   nativeBuildInputs = [
     makeWrapper
     removeReferencesTo
+    pkg-config
   ];
 
   buildInputs = [
     pcre2
+    libnotify
+    libappindicator
   ];
 
   disallowedReferences = [

From 23af17fe0d528c0919de608637834f00d8e24de6 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Mon, 28 Aug 2023 11:01:02 +1000
Subject: [PATCH 35/43] yubioath-flutter: Upgrade to Flutter 3.13.0

(cherry picked from commit 17bc84c2edff2a819249b3e6cb389a7ec4719555)
---
 .../misc/yubioath-flutter/default.nix         |  13 +-
 .../misc/yubioath-flutter/deps.json           | 309 +++---
 .../misc/yubioath-flutter/pubspec.lock        | 997 ++++++++++++++++++
 3 files changed, 1170 insertions(+), 149 deletions(-)
 create mode 100644 pkgs/applications/misc/yubioath-flutter/pubspec.lock

diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index 326e03721ece..6deefeae1a5a 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -1,5 +1,6 @@
 { lib
-, flutter37
+, writeText
+, flutter
 , python3
 , fetchFromGitHub
 , pcre2
@@ -11,7 +12,7 @@
 , removeReferencesTo
 }:
 
-flutter37.buildFlutterApplication rec {
+flutter.buildFlutterApplication rec {
   pname = "yubioath-flutter";
   version = "6.2.0";
 
@@ -24,10 +25,16 @@ flutter37.buildFlutterApplication rec {
 
   passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
 
+  pubspecLockFile = ./pubspec.lock;
   depsListFile = ./deps.json;
-  vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA=";
+  vendorHash = "sha256-RV7NoXJnd1jYGcU5YE0VV7VlMM7bz2JTMJTImOY3m38=";
 
   postPatch = ''
+    rm -f pubspec.lock
+    ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON {
+      dependency_overrides.intl = "^0.18.1";
+    })}" pubspec_overrides.yaml
+
     substituteInPlace linux/CMakeLists.txt \
       --replace "../build/linux/helper" "${passthru.helper}/libexec/helper"
   '';
diff --git a/pkgs/applications/misc/yubioath-flutter/deps.json b/pkgs/applications/misc/yubioath-flutter/deps.json
index 6d7414da346e..5754c1e0b27c 100644
--- a/pkgs/applications/misc/yubioath-flutter/deps.json
+++ b/pkgs/applications/misc/yubioath-flutter/deps.json
@@ -39,7 +39,7 @@
   },
   {
     "name": "json_serializable",
-    "version": "6.6.1",
+    "version": "6.7.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -59,7 +59,7 @@
   },
   {
     "name": "source_helper",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -70,7 +70,7 @@
   },
   {
     "name": "source_gen",
-    "version": "1.2.7",
+    "version": "1.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -86,7 +86,7 @@
   },
   {
     "name": "yaml",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -106,7 +106,7 @@
   },
   {
     "name": "source_span",
-    "version": "1.9.1",
+    "version": "1.10.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -124,21 +124,21 @@
   },
   {
     "name": "path",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "collection",
-    "version": "1.17.0",
+    "version": "1.17.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "glob",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -161,14 +161,14 @@
   },
   {
     "name": "meta",
-    "version": "1.8.0",
+    "version": "1.9.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "async",
-    "version": "2.10.0",
+    "version": "2.11.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -178,7 +178,7 @@
   },
   {
     "name": "dart_style",
-    "version": "2.2.4",
+    "version": "2.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -191,7 +191,7 @@
   },
   {
     "name": "pub_semver",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -201,14 +201,14 @@
   },
   {
     "name": "args",
-    "version": "2.4.0",
+    "version": "2.4.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "analyzer",
-    "version": "5.6.0",
+    "version": "6.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -228,7 +228,7 @@
   },
   {
     "name": "watcher",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -247,7 +247,7 @@
   },
   {
     "name": "crypto",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -256,7 +256,7 @@
   },
   {
     "name": "typed_data",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -274,7 +274,7 @@
   },
   {
     "name": "_fe_analyzer_shared",
-    "version": "54.0.0",
+    "version": "64.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -283,7 +283,7 @@
   },
   {
     "name": "build",
-    "version": "2.3.1",
+    "version": "2.4.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -294,19 +294,20 @@
       "glob",
       "logging",
       "meta",
+      "package_config",
       "path"
     ]
   },
   {
     "name": "logging",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "pubspec_parse",
-    "version": "1.2.1",
+    "version": "1.2.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -319,7 +320,7 @@
   },
   {
     "name": "json_annotation",
-    "version": "4.8.0",
+    "version": "4.8.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -328,7 +329,7 @@
   },
   {
     "name": "checked_yaml",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -352,7 +353,7 @@
   },
   {
     "name": "freezed",
-    "version": "2.3.2",
+    "version": "2.4.2",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -368,7 +369,7 @@
   },
   {
     "name": "freezed_annotation",
-    "version": "2.2.0",
+    "version": "2.4.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -379,13 +380,13 @@
   },
   {
     "name": "build_runner",
-    "version": "2.3.3",
+    "version": "2.4.6",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
+      "analyzer",
       "args",
       "async",
-      "analyzer",
       "build",
       "build_config",
       "build_daemon",
@@ -421,7 +422,7 @@
   },
   {
     "name": "web_socket_channel",
-    "version": "2.3.0",
+    "version": "2.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -466,7 +467,7 @@
   },
   {
     "name": "shelf_web_socket",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -477,7 +478,7 @@
   },
   {
     "name": "shelf",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -520,7 +521,7 @@
   },
   {
     "name": "js",
-    "version": "0.6.5",
+    "version": "0.6.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -549,7 +550,7 @@
   },
   {
     "name": "graphs",
-    "version": "2.2.0",
+    "version": "2.3.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -568,7 +569,7 @@
   },
   {
     "name": "code_builder",
-    "version": "4.4.0",
+    "version": "4.5.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -581,17 +582,47 @@
   },
   {
     "name": "matcher",
-    "version": "0.12.13",
+    "version": "0.12.16",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
+      "async",
       "meta",
-      "stack_trace"
+      "stack_trace",
+      "term_glyph",
+      "test_api"
+    ]
+  },
+  {
+    "name": "test_api",
+    "version": "0.6.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "async",
+      "boolean_selector",
+      "collection",
+      "meta",
+      "source_span",
+      "stack_trace",
+      "stream_channel",
+      "string_scanner",
+      "term_glyph"
+    ]
+  },
+  {
+    "name": "boolean_selector",
+    "version": "2.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "source_span",
+      "string_scanner"
     ]
   },
   {
     "name": "built_value",
-    "version": "8.4.3",
+    "version": "8.6.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -617,7 +648,7 @@
   },
   {
     "name": "build_runner_core",
-    "version": "7.2.7",
+    "version": "7.2.10",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -633,8 +664,8 @@
       "json_annotation",
       "logging",
       "meta",
-      "path",
       "package_config",
+      "path",
       "pool",
       "timing",
       "watcher",
@@ -643,7 +674,7 @@
   },
   {
     "name": "build_resolvers",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -654,8 +685,8 @@
       "crypto",
       "graphs",
       "logging",
-      "path",
       "package_config",
+      "path",
       "pool",
       "pub_semver",
       "stream_transform",
@@ -664,7 +695,7 @@
   },
   {
     "name": "build_daemon",
-    "version": "3.1.1",
+    "version": "4.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -683,7 +714,7 @@
   },
   {
     "name": "flutter_lints",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -692,7 +723,7 @@
   },
   {
     "name": "lints",
-    "version": "2.0.1",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -705,6 +736,7 @@
     "dependencies": [
       "flutter",
       "test_api",
+      "matcher",
       "path",
       "fake_async",
       "clock",
@@ -714,40 +746,38 @@
       "boolean_selector",
       "characters",
       "collection",
-      "js",
-      "matcher",
       "material_color_utilities",
       "meta",
       "source_span",
       "stream_channel",
       "string_scanner",
-      "term_glyph"
+      "term_glyph",
+      "web"
     ]
   },
+  {
+    "name": "web",
+    "version": "0.1.4-beta",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "material_color_utilities",
-    "version": "0.2.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "characters",
-    "version": "1.2.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "boolean_selector",
-    "version": "2.1.1",
+    "version": "0.5.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "source_span",
-      "string_scanner"
+      "collection"
     ]
   },
+  {
+    "name": "characters",
+    "version": "1.3.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "vector_math",
     "version": "2.1.4",
@@ -772,24 +802,6 @@
       "collection"
     ]
   },
-  {
-    "name": "test_api",
-    "version": "0.4.16",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "async",
-      "boolean_selector",
-      "collection",
-      "meta",
-      "source_span",
-      "stack_trace",
-      "stream_channel",
-      "string_scanner",
-      "term_glyph",
-      "matcher"
-    ]
-  },
   {
     "name": "flutter",
     "version": "0.0.0",
@@ -798,10 +810,10 @@
     "dependencies": [
       "characters",
       "collection",
-      "js",
       "material_color_utilities",
       "meta",
       "vector_math",
+      "web",
       "sky_engine"
     ]
   },
@@ -823,16 +835,13 @@
       "flutter_test",
       "path",
       "vm_service",
-      "archive",
       "async",
       "boolean_selector",
       "characters",
       "clock",
       "collection",
-      "crypto",
       "fake_async",
       "file",
-      "js",
       "matcher",
       "material_color_utilities",
       "meta",
@@ -843,18 +852,17 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "typed_data",
       "vector_math",
+      "web",
       "webdriver"
     ]
   },
   {
     "name": "webdriver",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "archive",
       "matcher",
       "path",
       "stack_trace",
@@ -868,19 +876,9 @@
     "source": "hosted",
     "dependencies": []
   },
-  {
-    "name": "archive",
-    "version": "3.3.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "crypto",
-      "path"
-    ]
-  },
   {
     "name": "vm_service",
-    "version": "9.4.0",
+    "version": "11.7.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -899,14 +897,11 @@
       "meta",
       "vm_service",
       "webdriver",
-      "archive",
       "async",
       "boolean_selector",
       "characters",
       "clock",
       "collection",
-      "crypto",
-      "js",
       "matcher",
       "material_color_utilities",
       "platform",
@@ -918,8 +913,8 @@
       "sync_http",
       "term_glyph",
       "test_api",
-      "typed_data",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {
@@ -1001,9 +996,31 @@
       "flutter"
     ]
   },
+  {
+    "name": "archive",
+    "version": "3.3.7",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "crypto",
+      "path",
+      "pointycastle"
+    ]
+  },
+  {
+    "name": "pointycastle",
+    "version": "3.7.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "convert",
+      "js"
+    ]
+  },
   {
     "name": "file_picker",
-    "version": "5.2.7",
+    "version": "5.3.4",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1018,7 +1035,7 @@
   },
   {
     "name": "win32",
-    "version": "3.1.3",
+    "version": "5.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1027,14 +1044,14 @@
   },
   {
     "name": "ffi",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "plugin_platform_interface",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1043,7 +1060,7 @@
   },
   {
     "name": "flutter_plugin_android_lifecycle",
-    "version": "2.0.7",
+    "version": "2.0.15",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1057,17 +1074,17 @@
     "source": "sdk",
     "dependencies": [
       "flutter",
-      "js",
       "characters",
       "collection",
       "material_color_utilities",
       "meta",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   },
   {
     "name": "vector_graphics_compiler",
-    "version": "1.1.4",
+    "version": "1.1.7",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1080,14 +1097,14 @@
   },
   {
     "name": "vector_graphics_codec",
-    "version": "1.1.4",
+    "version": "1.1.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "xml",
-    "version": "6.2.2",
+    "version": "6.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1098,7 +1115,7 @@
   },
   {
     "name": "petitparser",
-    "version": "5.1.0",
+    "version": "5.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1117,7 +1134,7 @@
   },
   {
     "name": "vector_graphics",
-    "version": "1.1.4",
+    "version": "1.1.7",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1127,7 +1144,7 @@
   },
   {
     "name": "path_provider",
-    "version": "2.0.14",
+    "version": "2.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1141,7 +1158,7 @@
   },
   {
     "name": "path_provider_windows",
-    "version": "2.1.4",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1154,7 +1171,7 @@
   },
   {
     "name": "path_provider_platform_interface",
-    "version": "2.0.6",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1165,7 +1182,7 @@
   },
   {
     "name": "path_provider_linux",
-    "version": "2.1.9",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1178,18 +1195,17 @@
   },
   {
     "name": "xdg_directories",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "meta",
-      "path",
-      "process"
+      "path"
     ]
   },
   {
     "name": "path_provider_foundation",
-    "version": "2.1.1",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1199,7 +1215,7 @@
   },
   {
     "name": "path_provider_android",
-    "version": "2.0.22",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1209,7 +1225,7 @@
   },
   {
     "name": "url_launcher",
-    "version": "6.1.10",
+    "version": "6.1.12",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1225,7 +1241,7 @@
   },
   {
     "name": "url_launcher_windows",
-    "version": "3.0.4",
+    "version": "3.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1235,7 +1251,7 @@
   },
   {
     "name": "url_launcher_platform_interface",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1245,7 +1261,7 @@
   },
   {
     "name": "url_launcher_web",
-    "version": "2.0.15",
+    "version": "2.0.18",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1256,7 +1272,7 @@
   },
   {
     "name": "url_launcher_macos",
-    "version": "3.0.3",
+    "version": "3.0.6",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1266,7 +1282,7 @@
   },
   {
     "name": "url_launcher_linux",
-    "version": "3.0.3",
+    "version": "3.0.5",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1276,7 +1292,7 @@
   },
   {
     "name": "url_launcher_ios",
-    "version": "6.1.1",
+    "version": "6.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1286,7 +1302,7 @@
   },
   {
     "name": "url_launcher_android",
-    "version": "6.0.24",
+    "version": "6.0.38",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1296,7 +1312,7 @@
   },
   {
     "name": "desktop_drop",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1317,7 +1333,7 @@
   },
   {
     "name": "screen_retriever",
-    "version": "0.1.6",
+    "version": "0.1.9",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1336,7 +1352,7 @@
   },
   {
     "name": "window_manager",
-    "version": "0.3.2",
+    "version": "0.3.6",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1381,7 +1397,7 @@
   },
   {
     "name": "shared_preferences",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1396,7 +1412,7 @@
   },
   {
     "name": "shared_preferences_windows",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1410,7 +1426,7 @@
   },
   {
     "name": "shared_preferences_platform_interface",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1420,7 +1436,7 @@
   },
   {
     "name": "shared_preferences_web",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1431,7 +1447,7 @@
   },
   {
     "name": "shared_preferences_linux",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1445,7 +1461,7 @@
   },
   {
     "name": "shared_preferences_foundation",
-    "version": "2.2.0",
+    "version": "2.3.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1455,7 +1471,7 @@
   },
   {
     "name": "shared_preferences_android",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1465,11 +1481,12 @@
   },
   {
     "name": "intl",
-    "version": "0.17.0",
+    "version": "0.18.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "clock",
+      "meta",
       "path"
     ]
   },
@@ -1484,11 +1501,11 @@
       "characters",
       "clock",
       "collection",
-      "js",
       "material_color_utilities",
       "meta",
       "path",
-      "vector_math"
+      "vector_math",
+      "web"
     ]
   }
 ]
diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock b/pkgs/applications/misc/yubioath-flutter/pubspec.lock
new file mode 100644
index 000000000000..524d76f7f233
--- /dev/null
+++ b/pkgs/applications/misc/yubioath-flutter/pubspec.lock
@@ -0,0 +1,997 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
+      url: "https://pub.dev"
+    source: hosted
+    version: "64.0.0"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.0"
+  archive:
+    dependency: "direct main"
+    description:
+      name: archive
+      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.7"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  async:
+    dependency: "direct main"
+    description:
+      name: async
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.11.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.6"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.10"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.6.2"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.0"
+  collection:
+    dependency: "direct main"
+    description:
+      name: collection
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.2"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.3+4"
+  crypto:
+    dependency: "direct main"
+    description:
+      name: crypto
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  desktop_drop:
+    dependency: "direct main"
+    description:
+      name: desktop_drop
+      sha256: ebba9c9cb0b54385998a977d741cc06fd8324878c08d5a36e9da61cd56b04cc6
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.3"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.4"
+  file_picker:
+    dependency: "direct main"
+    description:
+      name: file_picker
+      sha256: bdfa035a974a0c080576c4c8ed01cdf9d1b406a04c7daa05443ef0383a97bedc
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.4"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.15"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: b3c3a8a9714b7f88dd2a41e1efbc47f76d620b06ab427c62ae7bc82298cd7dbb
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  freezed:
+    dependency: "direct dev"
+    description:
+      name: freezed
+      sha256: "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  freezed_annotation:
+    dependency: "direct main"
+    description:
+      name: freezed_annotation
+      sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.0"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.18.1"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.8.1"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.7.1"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  local_notifier:
+    dependency: "direct main"
+    description:
+      name: local_notifier
+      sha256: cc855aa6362c8840e3d3b35b1c3b058a3a8becdb2b03d5a9aa3f3a1e861f0a03
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.5"
+  logging:
+    dependency: "direct main"
+    description:
+      name: logging
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.16"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
+  menu_base:
+    dependency: transitive
+    description:
+      name: menu_base
+      sha256: "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.1"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  path:
+    dependency: "direct main"
+    description:
+      name: path
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.3"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  path_provider:
+    dependency: "direct main"
+    description:
+      name: path_provider
+      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.4.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.7.3"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.4"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.3"
+  qrscanner_zxing:
+    dependency: "direct main"
+    description:
+      path: "android/flutter_plugins/qrscanner_zxing"
+      relative: true
+    source: path
+    version: "1.0.0"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: b0fbf7927333c5c318f7e2c22c8b4fd2542ba294de0373e80ecdb34e0dcd8dc4
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  screen_retriever:
+    dependency: "direct main"
+    description:
+      name: screen_retriever
+      sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.9"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.3"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  shortid:
+    dependency: transitive
+    description:
+      name: shortid
+      sha256: d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.4"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.2+1"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.0"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  tray_manager:
+    dependency: "direct main"
+    description:
+      name: tray_manager
+      sha256: b1975a05e0c6999e983cf9a58a6a098318c896040ccebac5398a3cc9e43b9c69
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.12"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.38"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.4"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.5"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.6"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.18"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  vector_graphics:
+    dependency: "direct main"
+    description:
+      name: vector_graphics
+      sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.7"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.7"
+  vector_graphics_compiler:
+    dependency: "direct main"
+    description:
+      name: vector_graphics_compiler
+      sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.7"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.7.1"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.7"
+  window_manager:
+    dependency: "direct main"
+    description:
+      name: window_manager
+      sha256: "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.6"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+sdks:
+  dart: ">=3.1.0-185.0.dev <4.0.0"
+  flutter: ">=3.10.0"

From cc6ca8219cfd6a35ecf97cb45dd693e2c59b9ee1 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Mon, 28 Aug 2023 10:58:46 +1000
Subject: [PATCH 36/43] yubioath-flutter: Remove reference removal

The shader in question no longer contains references to the SDK, and the derivation's debug output has valid references.

(cherry picked from commit 0606fd67326ff8684c7e88a8d44ace1d968ceba6)
---
 pkgs/applications/misc/yubioath-flutter/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index 6deefeae1a5a..9082fb11785b 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -70,9 +70,6 @@ flutter.buildFlutterApplication rec {
     substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \
       --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \
       --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"
-
-    # Remove unnecessary references to Flutter.
-    remove-references-to -t ${flutter37.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag
   '';
 
   nativeBuildInputs = [
@@ -87,11 +84,6 @@ flutter.buildFlutterApplication rec {
     libappindicator
   ];
 
-  disallowedReferences = [
-    flutter37
-    flutter37.unwrapped
-  ];
-
   meta = with lib; {
     description = "Yubico Authenticator for Desktop";
     homepage = "https://github.com/Yubico/yubioath-flutter";

From c57ff84913dbf33162ae2fa42b1429923d452339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 25 Sep 2023 03:40:20 +0200
Subject: [PATCH 37/43] [23.05] keep old flutters working, as dropping them is
 a breaking change

---
 .../development/compilers/flutter/default.nix |  18 +++-
 .../flutter/engine-artifacts/default.nix      |   6 +-
 .../flutter/engine-artifacts/hashes.nix       |   2 +
 .../flutter37/copy-without-perms.patch        |  17 +++
 .../flutter37/disable-auto-update.patch       |  49 +++++++++
 .../dont-validate-executable-location.patch   |  12 +++
 .../flutter/patches/flutter37/git-dir.patch   | 102 ++++++++++++++++++
 .../patches/flutter37/move-cache.patch        |  37 +++++++
 8 files changed, 237 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/flutter/patches/flutter37/copy-without-perms.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/flutter37/disable-auto-update.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/flutter37/dont-validate-executable-location.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/flutter37/git-dir.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/flutter37/move-cache.patch

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 156b76be0a72..89e9cee91187 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -71,6 +71,7 @@ let
 
   flutter2Patches = getPatches ./patches/flutter2;
   flutter3Patches = getPatches ./patches/flutter3;
+  flutter37Patches = getPatches ./patches/flutter37;
 in
 {
   inherit wrapFlutter;
@@ -109,18 +110,27 @@ in
       x86_64-darwin = "sha256-cJF8KB9fNb3hTZShDAPsMmr1neRdIMLvIl/m2tpzwQs=";
       aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4=";
     };
-    patches = flutter3Patches;
+    patches = flutter37Patches;
   };
 
-  v2 = mkFlutter {
+  v2 = let flutter = mkFlutter {
     version = "2.10.5";
     engineVersion = "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab";
     dartVersion = "2.16.2";
-    hash = "sha256-MxaWvlcCfXN8gsC116UMzqb4LgixHL3YjrGWy7WYgW4=";
     dartHash = {
       x86_64-linux = "sha256-vxKxysg6e3Qxtlp4dLxOZaBtgHGtl7XYd73zFZd9yJc=";
       aarch64-linux = "sha256-ZfpR6fj/a9Bsgrg31Z/uIJaCHIWtcQH3VTTVkDJKkwA=";
+      # these weren't supported previously
+      x86_64-darwin = lib.fakeHash;
+      aarch64-darwin = lib.fakeHash;
+    };
+    flutterHash = rec {
+      x86_64-linux = "sha256-MxaWvlcCfXN8gsC116UMzqb4LgixHL3YjrGWy7WYgW4=";
+      aarch64-linux = x86_64-linux;
+      # these weren't supported previously
+      x86_64-darwin = lib.fakeHash;
+      aarch64-darwin = lib.fakeHash;
     };
     patches = flutter2Patches;
-  };
+  }; in flutter // { meta = flutter.meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; }; };
 }
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
index 603b1456018d..73ba306336a7 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix
@@ -183,12 +183,14 @@ let
         if overrideUnpackCmd then
           (fetchurl {
             url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}";
-            hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive};
+            hash = if artifactDirectory != null && !(hashes ? ${artifactDirectory}) then lib.fakeHash else (let ar = if artifactDirectory == null then hashes else 
+hashes.${artifactDirectory}; in if !(ar ? ${archive}) then lib.fakeHash else ar.${archive});
           }) else
           (fetchzip {
             url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}";
             stripRoot = false;
-            hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive};
+            hash = if artifactDirectory != null && !(hashes ? ${artifactDirectory}) then lib.fakeHash else (let ar = if artifactDirectory == null then hashes else 
+hashes.${artifactDirectory}; in if !(ar ? ${archive}) then lib.fakeHash else ar.${archive});
           });
 
       setSourceRoot = if overrideUnpackCmd then "sourceRoot=`pwd`" else null;
diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
index 60ea36dfaa3d..02ef1b36fc50 100644
--- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
@@ -231,6 +231,8 @@
   };
 
   "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab" = {
+    skyNotice = "sha256-RRHgPRGCnD6OFlqCrtIsFTKYo1F9FvGvVDvSsAbIcPo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-3igOO+rgFh0fNTIIiiucqSmqC+NKFPG5H1CnIa9bDcM=";
     };
diff --git a/pkgs/development/compilers/flutter/patches/flutter37/copy-without-perms.patch b/pkgs/development/compilers/flutter/patches/flutter37/copy-without-perms.patch
new file mode 100644
index 000000000000..281b3840891f
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/flutter37/copy-without-perms.patch
@@ -0,0 +1,17 @@
+diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart
+index 5f458bd53e..7a6c59f98d 100644
+--- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart
++++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart
+@@ -128,7 +128,11 @@ Future<Depfile> copyAssets(
+               break;
+           }
+           if (doCopy) {
+-            await (content.file as File).copy(file.path);
++            // Not using File.copy because it preserves permissions.
++            final sourceFile = content.file as File;
++            final destinationFile = file;
++
++            await destinationFile.writeAsBytes(await sourceFile.readAsBytes(), flush: true);
+           }
+         } else {
+           await file.writeAsBytes(await entry.value.contentsAsBytes());
diff --git a/pkgs/development/compilers/flutter/patches/flutter37/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter37/disable-auto-update.patch
new file mode 100644
index 000000000000..874619046134
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/flutter37/disable-auto-update.patch
@@ -0,0 +1,49 @@
+diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
+index ab746724e9..1087983c87 100644
+--- a/bin/internal/shared.sh
++++ b/bin/internal/shared.sh
+@@ -215,8 +215,6 @@ function shared::execute() {
+     exit 1
+   fi
+ 
+-  upgrade_flutter 7< "$PROG_NAME"
+-
+   BIN_NAME="$(basename "$PROG_NAME")"
+   case "$BIN_NAME" in
+     flutter*)
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index 738fef987d..03a152e64f 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+           globals.flutterUsage.suppressAnalytics = true;
+         }
+ 
+-        globals.flutterVersion.ensureVersionFile();
+         final bool machineFlag = topLevelResults['machine'] as bool? ?? false;
+         final bool ci = await globals.botDetector.isRunningOnBot;
+         final bool redirectedCompletion = !globals.stdio.hasTerminal &&
+@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+         final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false;
+         final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
+ 
+-        if (topLevelResults.command?.name != 'upgrade' &&
+-            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
+-          await globals.flutterVersion.checkFlutterVersionFreshness();
+-        }
+ 
+         // See if the user specified a specific device.
+         globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
+
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+index dd80b1e46e..8e54517765 100644
+--- a/packages/flutter_tools/lib/src/cache.dart
++++ b/packages/flutter_tools/lib/src/cache.dart
+@@ -668,6 +668,7 @@
+ 
+   /// Update the cache to contain all `requiredArtifacts`.
+   Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async {
++    return;
+     if (!_lockEnabled) {
+       return;
+     }
diff --git a/pkgs/development/compilers/flutter/patches/flutter37/dont-validate-executable-location.patch b/pkgs/development/compilers/flutter/patches/flutter37/dont-validate-executable-location.patch
new file mode 100644
index 000000000000..5f391265ce15
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/flutter37/dont-validate-executable-location.patch
@@ -0,0 +1,12 @@
+diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
+index 651dc6cf36..236eb370e1 100644
+--- a/packages/flutter_tools/lib/src/doctor.dart
++++ b/packages/flutter_tools/lib/src/doctor.dart
+@@ -515,7 +515,6 @@ class FlutterValidator extends DoctorValidator {
+       final String flutterRoot = _flutterRoot();
+       messages.add(_getFlutterVersionMessage(frameworkVersion, versionChannel, flutterRoot));
+ 
+-      _validateRequiredBinaries(flutterRoot).forEach(messages.add);
+       messages.add(_getFlutterUpstreamMessage(version));
+       if (gitUrl != null) {
+         messages.add(ValidationMessage(_userMessages.flutterGitUrl(gitUrl)));
diff --git a/pkgs/development/compilers/flutter/patches/flutter37/git-dir.patch b/pkgs/development/compilers/flutter/patches/flutter37/git-dir.patch
new file mode 100644
index 000000000000..42ad756f8ea4
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/flutter37/git-dir.patch
@@ -0,0 +1,102 @@
+diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
+index 8e4cb81340..2c20940423 100644
+--- a/dev/bots/prepare_package.dart
++++ b/dev/bots/prepare_package.dart
+@@ -526,7 +526,7 @@ class ArchiveCreator {
+ 
+   Future<String> _runGit(List<String> args, {Directory? workingDirectory}) {
+     return _processRunner.runProcess(
+-      <String>['git', ...args],
++      <String>['git', '--git-dir', '.git', ...args],
+       workingDirectory: workingDirectory ?? flutterRoot,
+     );
+   }
+diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart
+index 666c190067..b6c3761f6f 100644
+--- a/packages/flutter_tools/lib/src/commands/downgrade.dart
++++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
+@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand {
+     // Detect unknown versions.
+     final ProcessUtils processUtils = _processUtils!;
+     final RunResult parseResult = await processUtils.run(<String>[
+-      'git', 'describe', '--tags', lastFlutterVersion,
++      'git', '--git-dir', '.git', 'describe', '--tags', lastFlutterVersion,
+     ], workingDirectory: workingDirectory);
+     if (parseResult.exitCode != 0) {
+       throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}');
+@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand {
+         continue;
+       }
+       final RunResult parseResult = await _processUtils!.run(<String>[
+-        'git', 'describe', '--tags', sha,
++        'git', '--git-dir', '.git', 'describe', '--tags', sha,
+       ], workingDirectory: workingDirectory);
+       if (parseResult.exitCode == 0) {
+         buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.');
+diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
+index dc47f17057..8068e2d1f5 100644
+--- a/packages/flutter_tools/lib/src/version.dart
++++ b/packages/flutter_tools/lib/src/version.dart
+@@ -111,7 +111,7 @@ class FlutterVersion {
+     String? channel = _channel;
+     if (channel == null) {
+       final String gitChannel = _runGit(
+-        'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
++        'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
+         globals.processUtils,
+         _workingDirectory,
+       );
+@@ -119,7 +119,7 @@ class FlutterVersion {
+       if (slash != -1) {
+         final String remote = gitChannel.substring(0, slash);
+         _repositoryUrl = _runGit(
+-          'git ls-remote --get-url $remote',
++          'git --git-dir .git ls-remote --get-url $remote',
+           globals.processUtils,
+           _workingDirectory,
+         );
+@@ -298,7 +298,7 @@ class FlutterVersion {
+   /// the branch name will be returned as `'[user-branch]'`.
+   String getBranchName({ bool redactUnknownBranches = false }) {
+     _branch ??= () {
+-      final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils);
++      final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils);
+       return branch == 'HEAD' ? channel : branch;
+     }();
+     if (redactUnknownBranches || _branch!.isEmpty) {
+@@ -331,7 +331,7 @@ class FlutterVersion {
+   /// wrapper that does that.
+   @visibleForTesting
+   static List<String> gitLog(List<String> args) {
+-    return <String>['git', '-c', 'log.showSignature=false', 'log'] + args;
++    return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args;
+   }
+ 
+   /// Gets the release date of the latest available Flutter version.
+@@ -708,7 +708,7 @@ class GitTagVersion {
+     String gitRef = 'HEAD'
+   }) {
+     if (fetchTags) {
+-      final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
++      final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory);
+       if (channel == 'dev' || channel == 'beta' || channel == 'stable') {
+         globals.printTrace('Skipping request to fetchTags - on well known channel $channel.');
+       } else {
+@@ -718,7 +718,7 @@ class GitTagVersion {
+     }
+     // find all tags attached to the given [gitRef]
+     final List<String> tags = _runGit(
+-      'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
++      'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n');
+ 
+     // Check first for a stable tag
+     final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$');
+@@ -739,7 +739,7 @@ class GitTagVersion {
+     // recent tag and number of commits past.
+     return parse(
+       _runGit(
+-        'git describe --match *.*.* --long --tags $gitRef',
++        'git --git-dir .git describe --match *.*.* --long --tags $gitRef',
+         processUtils,
+         workingDirectory,
+       )
diff --git a/pkgs/development/compilers/flutter/patches/flutter37/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter37/move-cache.patch
new file mode 100644
index 000000000000..efab81d2fc0e
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/flutter37/move-cache.patch
@@ -0,0 +1,37 @@
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+index dd80b1e46e..8e54517765 100644
+--- a/packages/flutter_tools/lib/src/cache.dart
++++ b/packages/flutter_tools/lib/src/cache.dart
+@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
+ import 'build_info.dart';
+ import 'convert.dart';
+ import 'features.dart';
++import 'globals.dart' as globals;
+ 
+ const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
+ const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
+@@ -318,8 +319,13 @@ class Cache {
+       return;
+     }
+     assert(_lock == null);
++    final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
++    if (!dir.existsSync()) {
++      dir.createSync(recursive: true);
++      globals.os.chmod(dir, '755');
++    }
+     final File lockFile =
+-      _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile'));
++      _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile'));
+     try {
+       _lock = lockFile.openSync(mode: FileMode.write);
+     } on FileSystemException catch (e) {
+@@ -378,8 +384,7 @@ class Cache {
+ 
+   String get devToolsVersion {
+     if (_devToolsVersion == null) {
+-      const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
+-      final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false);
++      final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools'));
+       if (!devToolsDir.existsSync()) {
+         throw Exception('Could not find directory at ${devToolsDir.path}');
+       }

From 0a82fab3da4f12abaf3021ed91d7e276d3c65a15 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 24 Sep 2023 12:21:40 +0100
Subject: [PATCH 38/43] inetutils: add patch for CVE-2023-40303

(cherry picked from commit e9ee21c8a3ec0ad08df50b8a6574f3526c35b71f)
---
 pkgs/tools/networking/inetutils/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 0f31ef01cf22..468cdf2e04e8 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, lib, fetchurl, ncurses, perl, help2man
+{ stdenv
+, lib
+, fetchurl
+, fetchpatch
+, ncurses
+, perl
+, help2man
 , apparmorRulesFromClosure
 , libxcrypt
 }:
@@ -17,6 +23,11 @@ stdenv.mkDerivation rec {
   patches = [
     # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
     ./inetutils-1_9-PATH_PROCNET_DEV.patch
+    (fetchpatch {
+      name = "CVE-2023-40303.patch";
+      url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=e4e65c03f4c11292a3e40ef72ca3f194c8bffdd6";
+      hash = "sha256-I5skN537owfpFpAZr4vDKPHuERI6+oq5/hFW2RQeUxI=";
+    })
   ];
 
   strictDeps = true;

From dbc792ac77ae8c145a0066387e57b2d15dbb83a8 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 24 Sep 2023 14:21:28 +0100
Subject: [PATCH 39/43] inetutils: enable tests

(cherry picked from commit 6ae0492d7ca023b52fbd8628d37cc1605f713e98)
---
 pkgs/tools/networking/inetutils/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 468cdf2e04e8..e4eb2eeaac41 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -51,9 +51,7 @@ stdenv.mkDerivation rec {
     "--disable-rexec"
   ] ++ lib.optional stdenv.isDarwin  "--disable-servers";
 
-  # Test fails with "UNIX socket name too long", probably because our
-  # $TMPDIR is too long.
-  doCheck = false;
+  doCheck = true;
 
   installFlags = [ "SUIDMODE=" ];
 

From d35b5bf9c75b72e54dcaf7b24964a794d2ce8edf Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 Sep 2023 11:13:30 +0100
Subject: [PATCH 40/43] [23.05] qemu: 8.0.4 -> 8.0.5

---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 16f9d1a2499b..bbaeb39de22d 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
     + lib.optionalString xenSupport "-xen"
     + lib.optionalString hostCpuOnly "-host-cpu-only"
     + lib.optionalString nixosTestRunner "-for-vm-tests";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${version}.tar.xz";
-    hash = "sha256-gcgX3aOK+Vi+W+8abPVbZYuy0/uHwealcd5reyxEUWw=";
+    hash = "sha256-kdMCTVHkQcI13LGwyHyzqrMCKDFm6NPV+CgqoGw0a+E=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]

From 11e1b92d0784f58910d695f35e3a581d68d80c21 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Thu, 7 Sep 2023 08:55:39 +0200
Subject: [PATCH 41/43] signal-desktop-beta: 6.30.0-beta.2 -> 6.31.0-beta.1

https://github.com/signalapp/Signal-Desktop/releases/tag/v6.31.0-beta.1
(cherry picked from commit 3115a7c1d6b55272d419132352e7a863b2fa152d)
---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 52192f37c71a..8a3e30a99dd7 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -6,7 +6,7 @@
   };
   signal-desktop-beta = {
     dir = "Signal Beta";
-    version = "6.30.0-beta.2";
-    hash = "sha256-EMgstKlHA6ilSlbDmsPAu/jNC21XGzF7LS7QzWcK2F0";
+    version = "6.31.0-beta.1";
+    hash = "sha256-j3DY+FY7kVVGvVuVZw/JxIpwxtgBttSyWcRaa9MCSjE=";
   };
 }

From 0a78df40ff1579b1307d6bc28b4cde18e73d0677 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Mon, 25 Sep 2023 02:59:29 +0200
Subject: [PATCH 42/43] signal-desktop-beta: 6.31.0-beta.1 -> 6.32.0-beta.1
 (source: 4f6b3ac83018238ea3940c1a1f208669cf1331a3)

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 8a3e30a99dd7..fdda1b65ce5f 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -6,7 +6,7 @@
   };
   signal-desktop-beta = {
     dir = "Signal Beta";
-    version = "6.31.0-beta.1";
-    hash = "sha256-j3DY+FY7kVVGvVuVZw/JxIpwxtgBttSyWcRaa9MCSjE=";
+    version = "6.32.0-beta.1";
+    hash = "sha256-7G4vjnEQnYOIVwXmBt1yZULvDaWXWTDgZCLWCZUq2Gs=";
   };
 }

From 9f15ef0cd99125ea0abf13ccb339c737de00f5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 25 Sep 2023 15:32:24 +0200
Subject: [PATCH 43/43] [23.05] mark old flutters as insecure

---
 pkgs/development/compilers/flutter/default.nix |  6 +++---
 pkgs/top-level/all-packages.nix                | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 89e9cee91187..793f14afba3b 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -94,7 +94,7 @@ in
     patches = flutter3Patches;
   };
 
-  v37 = mkFlutter {
+  v37 = let flutter = mkFlutter {
     version = "3.7.12";
     engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314";
     dartVersion = "2.19.6";
@@ -111,7 +111,7 @@ in
       aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4=";
     };
     patches = flutter37Patches;
-  };
+  }; in flutter // { meta = flutter.meta // { knownVulnerabilities = [ "CVE-2023-4863 WebP Vulnerability" ]; }; };
 
   v2 = let flutter = mkFlutter {
     version = "2.10.5";
@@ -132,5 +132,5 @@ in
       aarch64-darwin = lib.fakeHash;
     };
     patches = flutter2Patches;
-  }; in flutter // { meta = flutter.meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; }; };
+  }; in flutter // { meta = flutter.meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; knownVulnerabilities = [ "CVE-2023-4863 WebP Vulnerability" ]; }; };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7aed8315a663..eb3eb2ec97ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14869,11 +14869,15 @@ with pkgs;
   flutterPackages =
     recurseIntoAttrs (callPackage ../development/compilers/flutter { });
   flutter-unwrapped = flutterPackages.stable;
-  flutter37-unwrapped = flutterPackages.v37;
-  flutter2-unwrapped = flutterPackages.v2;
+  flutter37-unwrapped = let flutter =flutterPackages.v37;
+  in flutter // { meta = flutter.meta // { insecure = true; knownVulnerabilities = [ "CVE-2023-4863 WebP Vulnerability" ]; }; };
+  flutter2-unwrapped = let flutter = flutterPackages.v2;
+  in flutter // { meta = flutter.meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; insecure = true; knownVulnerabilities = [ "CVE-2023-4863 WebP Vulnerability" ]; }; };
   flutter = flutterPackages.wrapFlutter flutter-unwrapped;
-  flutter37 = flutterPackages.wrapFlutter flutter37-unwrapped;
-  flutter2 = flutterPackages.wrapFlutter flutter2-unwrapped;
+  flutter37 = let flutter = flutterPackages.wrapFlutter flutter37-unwrapped;
+  in flutter // { meta = flutter.meta // { insecure = true; knownVulnerabilities = [ "CVE-2023-4863 WebP Vulnerability" ]; }; };
+  flutter2 = let flutter = flutterPackages.wrapFlutter flutter2-unwrapped;
+  in flutter // { meta = flutter.meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; insecure = true; knownVulnerabilities = [ "CVE-2023-4863 WebP Vulnerability" ]; }; };
 
   fnm = callPackage ../development/tools/fnm {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security;