Skip to content

Commit 807602f

Browse files
RossComputerGuyRossComputerGuy
authored
flutter332: 3.32.0-0.4.pre -> 3.32.0 (#409286)
2 parents c26bdfc + 348f651 commit 807602f

File tree

6 files changed

+88
-50
lines changed

6 files changed

+88
-50
lines changed

‎pkgs/by-name/cw/cwtch-ui/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
cwtch,
33
fetchgit,
4-
flutter,
4+
flutter329,
55
lib,
66
tor,
77
}:
@@ -10,7 +10,7 @@ let
1010
tor
1111
];
1212
in
13-
flutter.buildFlutterApplication rec {
13+
flutter329.buildFlutterApplication rec {
1414
pname = "cwtch-ui";
1515
version = "1.15.5";
1616
# This Gitea instance has archive downloads disabled, so: fetchgit

‎pkgs/by-name/fi/finamp/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
lib,
33
stdenv,
4-
flutter,
4+
flutter329,
55
mpv-unwrapped,
66
patchelf,
77
fetchFromGitHub,
@@ -11,7 +11,7 @@
1111
let
1212
version = "0.9.16-beta";
1313
in
14-
flutter.buildFlutterApplication {
14+
flutter329.buildFlutterApplication {
1515
inherit version;
1616
pname = "finamp";
1717
src = fetchFromGitHub {

‎pkgs/by-name/fi/firmware-updater/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
lib,
33
writeText,
4-
flutter,
4+
flutter329,
55
fetchFromGitHub,
66
}:
77

8-
flutter.buildFlutterApplication rec {
8+
flutter329.buildFlutterApplication rec {
99
pname = "firmware-updater";
1010
version = "0-unstable-2024-20-11";
1111

‎pkgs/by-name/li/libretrack/package.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
libappindicator,
66
}:
77

8-
flutterPackages-source.stable.buildFlutterApplication rec {
8+
flutterPackages-source.v3_29.buildFlutterApplication rec {
99
pname = "libretrack";
1010
version = "1.7.0";
1111

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
{
2-
"version": "3.32.0-0.4.pre",
3-
"engineVersion": "38e19d01dcac654bbb941b771cc06efd4ed4a93f",
2+
"version": "3.32.0",
3+
"engineVersion": "18818009497c581ede5d8a3b8b833b81d00cebb7",
44
"engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
55
"engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
6-
"channel": "beta",
6+
"channel": "stable",
77
"engineHashes": {
88
"aarch64-linux": {
9-
"aarch64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q=",
10-
"x86_64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q="
9+
"aarch64-linux": "sha256-zGlgnVbNPZ9OX5VFxaajc8xqPKftzZMkyem2NLk8EH8=",
10+
"x86_64-linux": "sha256-zGlgnVbNPZ9OX5VFxaajc8xqPKftzZMkyem2NLk8EH8="
1111
},
1212
"x86_64-linux": {
13-
"aarch64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA=",
14-
"x86_64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA="
13+
"aarch64-linux": "sha256-TWwsPtAnkQzsvNLUd5Q3G80ALeh7nM/XV4M6rfBvUGY=",
14+
"x86_64-linux": "sha256-TWwsPtAnkQzsvNLUd5Q3G80ALeh7nM/XV4M6rfBvUGY="
1515
}
1616
},
17-
"dartVersion": "3.8.0-278.4.beta",
17+
"dartVersion": "3.8.0",
1818
"dartHash": {
19-
"x86_64-linux": "sha256-jyLGethyv9KGGV9IjlXnSno6oJTwUFpR8wsgVbT+UTY=",
20-
"aarch64-linux": "sha256-NEYfdqLA5+Po9fI0YfAbsXPMgaEkhkDfm2XHOROU4MM=",
21-
"x86_64-darwin": "sha256-09AvWYmW2LHaUe2hTv/EVGwjY6GTCV7reiqUVQKDkrM=",
22-
"aarch64-darwin": "sha256-IwJJGFW+hdt7Yb86DdGxWjiEp0XJnLJUzqJvKrN9iTs="
19+
"x86_64-linux": "sha256-/b6dNwqeMymHKI4cz2ggfVtcHWtdsrlVyEZ1Z2G0RKw=",
20+
"aarch64-linux": "sha256-tXIeGM7n1lx9GOwOMEFapiW0sHBlhupx5NCAtFd73Pk=",
21+
"x86_64-darwin": "sha256-wD9Z3J29N4ecWKmCetj5GnbTQ8LiJ1tZFEbPuG6ny5w=",
22+
"aarch64-darwin": "sha256-IIFn6OTpTH8LzwZzF7V8yUrhHkjavMUWX7n62YEMABk="
2323
},
24-
"flutterHash": "sha256-+UQNtN0BrSxEwGdnb9f63Bg46q+zKwqStYBKgIB/hic=",
24+
"flutterHash": "sha256-Wk84RfnPvPVVnnbwGcnHIcRnu3Kizo2AkRQbVSEw+1M=",
2525
"artifactHashes": {
2626
"android": {
27-
"aarch64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=",
28-
"aarch64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE=",
29-
"x86_64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=",
30-
"x86_64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE="
27+
"aarch64-darwin": "sha256-+YUzIG/qUFb4X2ftR6Gf0h1mt/5Dy59B7QD09X1XVYY=",
28+
"aarch64-linux": "sha256-lZIo8AGzrXant29kfiOKlfQ0SJAPXpsdZCaKfqxn0zA=",
29+
"x86_64-darwin": "sha256-+YUzIG/qUFb4X2ftR6Gf0h1mt/5Dy59B7QD09X1XVYY=",
30+
"x86_64-linux": "sha256-lZIo8AGzrXant29kfiOKlfQ0SJAPXpsdZCaKfqxn0zA="
3131
},
3232
"fuchsia": {
33-
"aarch64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
34-
"aarch64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
35-
"x86_64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=",
36-
"x86_64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc="
33+
"aarch64-darwin": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
34+
"aarch64-linux": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
35+
"x86_64-darwin": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
36+
"x86_64-linux": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk="
3737
},
3838
"ios": {
39-
"aarch64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
40-
"aarch64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
41-
"x86_64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=",
42-
"x86_64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU="
39+
"aarch64-darwin": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
40+
"aarch64-linux": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
41+
"x86_64-darwin": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
42+
"x86_64-linux": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4="
4343
},
4444
"linux": {
45-
"aarch64-darwin": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=",
46-
"aarch64-linux": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=",
47-
"x86_64-darwin": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU=",
48-
"x86_64-linux": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU="
45+
"aarch64-darwin": "sha256-y/xxUQK/9GeXjMTUPZSGhfP83rJzCm1Pd2PMjnAHdnk=",
46+
"aarch64-linux": "sha256-y/xxUQK/9GeXjMTUPZSGhfP83rJzCm1Pd2PMjnAHdnk=",
47+
"x86_64-darwin": "sha256-P5UQiY4QHLJQMmTpTfTFfh6QrqelhWyaGpSXNtM8vJE=",
48+
"x86_64-linux": "sha256-P5UQiY4QHLJQMmTpTfTFfh6QrqelhWyaGpSXNtM8vJE="
4949
},
5050
"macos": {
51-
"aarch64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
52-
"aarch64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
53-
"x86_64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=",
54-
"x86_64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI="
51+
"aarch64-darwin": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
52+
"aarch64-linux": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
53+
"x86_64-darwin": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
54+
"x86_64-linux": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko="
5555
},
5656
"universal": {
57-
"aarch64-darwin": "sha256-EocA/pXkEw7fe0fdDkC/WDk5JAVlwTJybNAQDw0/wO4=",
58-
"aarch64-linux": "sha256-yIwNmd0DVsLsEUH1+W4AeJXf9l/WIC8HLbHooIZdqk0=",
59-
"x86_64-darwin": "sha256-5Y5gRLoCzTYuP4JXf9APKbHXl+khuzleQIxNiWyVjbM=",
60-
"x86_64-linux": "sha256-jqe3Z4caAe890CeJST9pAjgunGJsqnycGFqNvn8XNAI="
57+
"aarch64-darwin": "sha256-bt/UiY3t1wZUnpMo1uVQPdlG/7X+OrAOZRXIaXKH3Ls=",
58+
"aarch64-linux": "sha256-NShVNyK6Cx5bddhv6hg3rM+QPczrm2MmHCgb14h78SA=",
59+
"x86_64-darwin": "sha256-zXSufTmlyaHM0fJinirUfB3XjD3dzKFD6iyhUADsyQY=",
60+
"x86_64-linux": "sha256-MQw71FYYuLKd60cwMddAjVe9vgwx8MR4xVe0Z9J7uAo="
6161
},
6262
"web": {
63-
"aarch64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
64-
"aarch64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
65-
"x86_64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=",
66-
"x86_64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA="
63+
"aarch64-darwin": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
64+
"aarch64-linux": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
65+
"x86_64-darwin": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
66+
"x86_64-linux": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE="
6767
},
6868
"windows": {
69-
"x86_64-darwin": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg=",
70-
"x86_64-linux": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg="
69+
"x86_64-darwin": "sha256-3ZfYqlyjBaBaZjxp9k2DCsD4QZL/+fbXfCFxX3i4Q/Q=",
70+
"x86_64-linux": "sha256-3ZfYqlyjBaBaZjxp9k2DCsD4QZL/+fbXfCFxX3i4Q/Q="
7171
}
7272
},
7373
"pubspecLock": {

‎pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
This patch introducing error handling in the invocation of packagesWithNativeAssets within flutter_tools.
2+
3+
--- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
4+
+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
5+
@@ -357,7 +357,15 @@
6+
}
7+
8+
Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {
9+
- final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
10+
+ late final List<String> packagesWithNativeAssets;
11+
+ try {
12+
+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
13+
+ } catch (error, stackTrace) {
14+
+ globals.logger.printTrace(
15+
+ 'Error while checking for native assets packages: $error\n$stackTrace'
16+
+ );
17+
+ packagesWithNativeAssets = <String>[];
18+
+ }
19+
if (packagesWithNativeAssets.isEmpty) {
20+
globals.logger.printTrace(
21+
'No packages with native assets. Skipping native assets compilation.',
22+
@@ -385,7 +393,15 @@
23+
FileSystem fileSystem,
24+
FlutterNativeAssetsBuildRunner buildRunner,
25+
) async {
26+
- final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
27+
+ late final List<String> packagesWithNativeAssets;
28+
+ try {
29+
+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
30+
+ } catch (error, stackTrace) {
31+
+ globals.logger.printTrace(
32+
+ 'Error while checking for native assets packages: $error\n$stackTrace'
33+
+ );
34+
+ packagesWithNativeAssets = <String>[];
35+
+ }
36+
if (packagesWithNativeAssets.isEmpty) {
37+
globals.logger.printTrace(
38+
'No packages with native assets. Skipping native assets compilation.',

0 commit comments

Comments
 (0)