diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/flutter')
3 files changed, 37 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 736178e76ca2..f7dc6f8e87c3 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,7 +4,7 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.0.3"; + version = "2.2.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; in @@ -15,7 +15,7 @@ in pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = "14a63cpkp78rgymmlrppds69jsrdarg33dr43nb7s61r0xfh9icm"; + sha256 = "009pwk2casz10gibgjpz08102wxmkq9iq3994b3c2q342g6526g0"; }; patches = getPatches ./patches; }; diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index 1fe098136843..d0fd363d3c64 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch @@ -1,5 +1,5 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index c44f867746..c9eda34e26 100644 +index be9320210e..6eb50aae95 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh @@ -218,8 +218,6 @@ function shared::execute() { @@ -12,16 +12,23 @@ index c44f867746..c9eda34e26 100644 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 3dc7929dd1..e65d70d55b 100644 +index 550a75bc65..c98a4591cc 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -246,11 +246,7 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner<void> { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); final bool machineFlag = topLevelResults['machine'] as bool; -- if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { + final bool ci = await globals.botDetector.isRunningOnBot; + final bool redirectedCompletion = !globals.stdio.hasTerminal && +@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + final bool versionCheckFlag = topLevelResults['version-check'] as bool; + final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; + +- if (topLevelResults.command?.name != 'upgrade' && +- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch index d6a45a97e581..2610c155804b 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -1,24 +1,24 @@ diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index a6c59bae07..21f6c9812a 100644 +index 80fb16673f..5723f93f9f 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -5,6 +5,7 @@ +@@ -7,6 +7,7 @@ import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; +import 'base/common.dart'; import 'base/context.dart'; + import 'base/deferred_component.dart'; import 'base/file_system.dart'; - import 'base/logger.dart'; -@@ -14,6 +15,7 @@ import 'cache.dart'; +@@ -16,6 +17,7 @@ import 'build_info.dart'; + import 'cache.dart'; import 'convert.dart'; import 'dart/package_map.dart'; - import 'devfs.dart'; +import 'globals.dart' as globals; + import 'devfs.dart'; import 'flutter_manifest.dart'; import 'license_collector.dart'; - import 'project.dart'; -@@ -377,7 +379,7 @@ class ManifestAssetBundle implements AssetBundle { +@@ -449,7 +451,7 @@ class ManifestAssetBundle implements AssetBundle { for (final Map<String, Object> font in family['fonts'] as List<Map<String, Object>>) { final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String); result.add(_Asset( @@ -28,32 +28,40 @@ index a6c59bae07..21f6c9812a 100644 entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 11e3bf3e11..39d6fae0d1 100644 +index 152d4e75e5..1fcff7e2bd 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -321,8 +321,15 @@ class Cache { +@@ -9,6 +9,7 @@ import 'package:file/memory.dart'; + import 'package:meta/meta.dart'; + import 'package:process/process.dart'; + ++import 'globals.dart' as globals; + import 'base/common.dart'; + import 'base/error_handling_io.dart'; + import 'base/file_system.dart'; +@@ -298,8 +299,15 @@ class Cache { return; } assert(_lock == null); + -+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); ++ 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')); +- _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) { -@@ -424,7 +431,7 @@ class Cache { +@@ -404,7 +412,7 @@ class Cache { if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); + return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); +- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache')); ++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); } } |