git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #90681 from kolaente/update/flutter

flutter stable (1.12.13+hotfix.9 -> 1.17.3), beta (1.15.17 -> 1.19.0-4.1.pre) and dev (1.17.0-dev.5.0 -> 1.20.0-0.0.pre) update

commit7cdb25cabeb41d0dd691263e386a0560a518cb43 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 28 Jul 2020, 11:14 (6 years ago) parentf4997eff1e1588
5 files changed+68−64
pkgs/development/compilers/flutter/default.nix+10−8 pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch+14−14 pkgs/development/compilers/flutter/patches/beta/move-cache.patch+12−11 pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch+9−9 pkgs/development/compilers/flutter/patches/stable/move-cache.patch+23−22
pkgs/development/compilers/flutter/default.nix+10−8
@@ -6,26 +6,28 @@ let
66 let files = builtins.attrNames (builtins.readDir dir);
77 in map (f: dir + ("/" + f)) files;
88in {
9− stable = mkFlutter {
9+ stable = mkFlutter rec {
1010 pname = "flutter";
1111 channel = "stable";
12− version = "1.12.13+hotfix.9";
13− sha256Hash = "1ql3zvmmk5zk47y30lajxaam04q6vr373dayq15jv4vpc0fzif1y";
12+ version = "1.17.5";
13+ filename = "flutter_linux_${version}-${channel}.tar.xz";
14+ sha256Hash = "0kapja3nh7dfhjbn2np02wghijrjnpzsv4hz10fj54hs8hdx19di";
1415 patches = getPatches ./patches/stable;
1516 };
16− beta = mkFlutter {
17+ beta = mkFlutter rec {
1718 pname = "flutter-beta";
1819 channel = "beta";
19− version = "1.15.17";
20− sha256Hash = "0iil6y6y477dhjgzx54ab5m9nj0jg4xl8x4zzd9iwh8m756r7qsd";
20+ version = "1.19.0-4.3.pre";
21+ filename = "flutter_linux_${version}-${channel}.tar.xz";
22+ sha256Hash = "1hlkvvcfy53g69qnqq29izh5c0ylmx4w9m5kb78x97yld6jzf37p";
2123 patches = getPatches ./patches/beta;
2224 };
2325 dev = mkFlutter rec {
2426 pname = "flutter-dev";
2527 channel = "dev";
26− version = "1.17.0-dev.5.0";
28+ version = "1.20.0-3.0.pre";
2729 filename = "flutter_linux_${version}-${channel}.tar.xz";
28− sha256Hash = "0ks2jf2bd42y2jsc91p33r57q7j3m94d8ihkmlxzwi53x1mwp0pk";
30+ sha256Hash = "0pi5xmg8b863l07fzx7m7pdzh9gmpfsgva1sahx8a6nxkqdpgc50";
2931 patches = getPatches ./patches/beta;
3032 };
3133}
pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch+14−14
@@ -1,24 +1,24 @@
1−diff --git a/bin/flutter b/bin/flutter
2−index e0c18e235..2c3fb7ddd 100755
3−--- a/bin/flutter
4−+++ b/bin/flutter
5−@@ -185,8 +185,6 @@ fi
6− # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
7− # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
1+diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
2+index 702bd9ed5..4d4dc94c6 100755
3+--- a/bin/internal/shared.sh
4++++ b/bin/internal/shared.sh
5+@@ -204,8 +204,6 @@ function shared::execute() {
6+ # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
7+ # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
88
9−-(upgrade_flutter) 3< "$PROG_NAME"
9+- upgrade_flutter 7< "$PROG_NAME"
1010-
11− # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
12− # separate space-separated args.
13− "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
11+ BIN_NAME="$(basename "$PROG_NAME")"
12+ case "$BIN_NAME" in
13+ flutter*)
1414diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
15−index 99455ae64..f5b0cb59c 100644
15+index 21be933e1..2ea73c4c0 100644
1616--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
1717+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
18−@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
18+@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
19+ globals.flutterUsage.suppressAnalytics = true;
1920 }
2021
21− _checkFlutterCopy();
2222- try {
2323- await globals.flutterVersion.ensureVersionFile();
2424- } on FileSystemException catch (e) {
pkgs/development/compilers/flutter/patches/beta/move-cache.patch+12−11
@@ -1,5 +1,5 @@
11diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
2−index 8e511eefd..fbc7d6ac3 100644
2+index 8e511eefd..fef3cca8b 100644
33--- a/dev/devicelab/lib/framework/runner.dart
44+++ b/dev/devicelab/lib/framework/runner.dart
55@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
@@ -12,31 +12,31 @@ index 8e511eefd..fbc7d6ac3 100644
1212 if (!Platform.isWindows) {
1313 await exec(
1414diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
15−index 79b06949f..9040ba0a8 100644
15+index c680de599..480abfb77 100644
1616--- a/packages/flutter_tools/lib/src/asset.dart
1717+++ b/packages/flutter_tools/lib/src/asset.dart
18−@@ -6,6 +6,7 @@ import 'dart:async';
19−
18+@@ -8,6 +8,7 @@ import 'package:meta/meta.dart';
19+ import 'package:package_config/package_config.dart';
2020 import 'package:yaml/yaml.dart';
2121
2222+import 'base/common.dart';
2323 import 'base/context.dart';
2424 import 'base/file_system.dart';
2525 import 'base/utils.dart';
26−@@ -325,7 +326,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
27− for (final Map<dynamic, dynamic> font in family['fonts']) {
26+@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
27+ for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
2828 final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
2929 result.add(_Asset(
3030- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
31−+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
31++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
3232 relativeUri: Uri(path: entryUri.pathSegments.last),
3333 entryUri: entryUri,
34− ));
34+ package: null,
3535diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
36−index 715189938..5afb2a0db 100644
36+index c0946782c..bdbc35cb8 100644
3737--- a/packages/flutter_tools/lib/src/cache.dart
3838+++ b/packages/flutter_tools/lib/src/cache.dart
39−@@ -189,8 +189,14 @@ class Cache {
39+@@ -202,8 +202,15 @@ class Cache {
4040 return;
4141 }
4242 assert(_lock == null);
@@ -46,13 +46,14 @@ index 715189938..5afb2a0db 100644
4646+ dir.createSync(recursive: true);
4747+ globals.os.chmod(dir, '755');
4848+ }
49++
4950 final File lockFile =
5051- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
5152+ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile'));
5253 try {
5354 _lock = lockFile.openSync(mode: FileMode.write);
5455 } on FileSystemException catch (e) {
55−@@ -290,7 +296,7 @@ class Cache {
56+@@ -306,7 +313,7 @@ class Cache {
5657 if (_rootOverride != null) {
5758 return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
5859 } else {
pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch+9−9
@@ -1,5 +1,5 @@
11diff --git a/bin/flutter b/bin/flutter
2−index 3955f8f39..1e7573d30 100755
2+index cdf974233..1f7de1c1b 100755
33--- a/bin/flutter
44+++ b/bin/flutter
55@@ -185,8 +185,6 @@ fi
@@ -12,20 +12,20 @@ index 3955f8f39..1e7573d30 100755
1212 # separate space-separated args.
1313 "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
1414diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
15−index 5e45819d9..ab748b059 100644
15+index b3e69714f..a9eb76234 100644
1616--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
1717+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
18−@@ -377,13 +377,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
18+@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
1919 }
2020
2121 _checkFlutterCopy();
2222- try {
23−- await FlutterVersion.instance.ensureVersionFile();
23+- await globals.flutterVersion.ensureVersionFile();
2424- } on FileSystemException catch (e) {
25−- printError('Failed to write the version file to the artifact cache: "$e".');
26−- printError('Please ensure you have permissions in the artifact cache directory.');
25+- globals.printError('Failed to write the version file to the artifact cache: "$e".');
26+- globals.printError('Please ensure you have permissions in the artifact cache directory.');
2727- throwToolExit('Failed to write the version file');
2828- }
29− if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool) {
30− await FlutterVersion.instance.checkFlutterVersionFreshness();
31− }
29+ final bool machineFlag = topLevelResults['machine'] as bool;
30+ if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
31+ await globals.flutterVersion.checkFlutterVersionFreshness();
pkgs/development/compilers/flutter/patches/stable/move-cache.patch+23−22
@@ -1,5 +1,5 @@
11diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
2−index 9fae74726..d88d6ecbb 100644
2+index 8e511eefd..fef3cca8b 100644
33--- a/dev/devicelab/lib/framework/runner.dart
44+++ b/dev/devicelab/lib/framework/runner.dart
55@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
@@ -7,57 +7,58 @@ index 9fae74726..d88d6ecbb 100644
77 final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
88 final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
99- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
10−+ recursiveCopy(Directory(path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
10++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
1111 copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
1212 if (!Platform.isWindows) {
1313 await exec(
1414diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
15−index e6216c737..5ab497092 100644
15+index c680de599..480abfb77 100644
1616--- a/packages/flutter_tools/lib/src/asset.dart
1717+++ b/packages/flutter_tools/lib/src/asset.dart
18−@@ -6,6 +6,7 @@ import 'dart:async';
19−
18+@@ -8,6 +8,7 @@ import 'package:meta/meta.dart';
19+ import 'package:package_config/package_config.dart';
2020 import 'package:yaml/yaml.dart';
2121
2222+import 'base/common.dart';
2323 import 'base/context.dart';
2424 import 'base/file_system.dart';
25− import 'base/platform.dart';
26−@@ -326,7 +327,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
27− for (Map<dynamic, dynamic> font in family['fonts']) {
28− final Uri entryUri = fs.path.toUri(font['asset'] as String);
25+ import 'base/utils.dart';
26+@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
27+ for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
28+ final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
2929 result.add(_Asset(
30−- baseDir: fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
31−+ baseDir: fs.path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
30+- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
31++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
3232 relativeUri: Uri(path: entryUri.pathSegments.last),
3333 entryUri: entryUri,
34− ));
34+ package: null,
3535diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
36−index 5e1950b56..45585f9c0 100644
36+index c0946782c..bdbc35cb8 100644
3737--- a/packages/flutter_tools/lib/src/cache.dart
3838+++ b/packages/flutter_tools/lib/src/cache.dart
39−@@ -164,8 +164,14 @@ class Cache {
39+@@ -202,8 +202,15 @@ class Cache {
4040 return;
4141 }
4242 assert(_lock == null);
4343+
44−+ final Directory dir = fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter'));
44++ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
4545+ if (!dir.existsSync()) {
4646+ dir.createSync(recursive: true);
47−+ os.chmod(dir, '755');
47++ globals.os.chmod(dir, '755');
4848+ }
49++
4950 final File lockFile =
50−- fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
51−+ fs.file(fs.path.join(homeDirPath, '.cache', 'flutter', 'lockfile'));
51+- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
52++ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile'));
5253 try {
5354 _lock = lockFile.openSync(mode: FileMode.write);
5455 } on FileSystemException catch (e) {
55−@@ -239,7 +245,7 @@ class Cache {
56+@@ -306,7 +313,7 @@ class Cache {
5657 if (_rootOverride != null) {
57− return fs.directory(fs.path.join(_rootOverride.path, 'bin', 'cache'));
58+ return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
5859 } else {
59−- return fs.directory(fs.path.join(flutterRoot, 'bin', 'cache'));
60−+ return fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter'));
60+- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache'));
61++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
6162 }
6263 }
6364