pyrox.dev / nixpkgs
lol
fork atom

flutterPackages.v3_24: fix patches

Tristan Ross a2b56cd6 92c116b4

+273
unified split
pkgs/development/compilers/flutter/patches/deregister-pub-dependencies-artifact.patch pkgs/development/compilers/flutter/versions/3_13/patches/deregister-pub-dependencies-artifact.patch
pkgs/development/compilers/flutter/patches/disable-auto-update.patch pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch
+19
pkgs/development/compilers/flutter/versions/3_16/patches/deregister-pub-dependencies-artifact.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart 2 + index 252021cf78..e50ef0885d 100644 3 + --- a/packages/flutter_tools/lib/src/flutter_cache.dart 4 + +++ b/packages/flutter_tools/lib/src/flutter_cache.dart 5 + @@ -51,14 +51,6 @@ class FlutterCache extends Cache { 6 + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); 7 + } 8 + registerArtifact(FontSubsetArtifacts(this, platform: platform)); 9 + - registerArtifact(PubDependencies( 10 + - logger: logger, 11 + - // flutter root and pub must be lazily initialized to avoid accessing 12 + - // before the version is determined. 13 + - flutterRoot: () => Cache.flutterRoot!, 14 + - pub: () => pub, 15 + - projectFactory: projectFactory, 16 + - )); 17 + } 18 + } 19 +
+37
pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart 2 + index b7e624b4e2..edfdde118b 100644 3 + --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart 4 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart 5 + @@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and 6 + 7 + // Populate the cache. We call this before pub get below so that the 8 + // sky_engine package is available in the flutter cache for pub to find. 9 + - if (shouldUpdateCache) { 10 + + if (false) { 11 + // First always update universal artifacts, as some of these (e.g. 12 + // ios-deploy on macOS) are required to determine `requiredArtifacts`. 13 + final bool offline; 14 + diff --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 5d6d78639f..90a4dfa555 100644 16 + --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 17 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 18 + @@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 19 + globals.flutterUsage.suppressAnalytics = true; 20 + } 21 + 22 + - globals.flutterVersion.ensureVersionFile(); 23 + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; 24 + final bool ci = await globals.botDetector.isRunningOnBot; 25 + final bool redirectedCompletion = !globals.stdio.hasTerminal && 26 + @@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 27 + final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; 28 + final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; 29 + 30 + - if (topLevelResults.command?.name != 'upgrade' && 31 + - (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { 32 + - await globals.flutterVersion.checkFlutterVersionFreshness(); 33 + - } 34 + - 35 + // See if the user specified a specific device. 36 + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; 37 + if (specifiedDeviceId != null) {
+19
pkgs/development/compilers/flutter/versions/3_19/patches/deregister-pub-dependencies-artifact.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart 2 + index 252021cf78..e50ef0885d 100644 3 + --- a/packages/flutter_tools/lib/src/flutter_cache.dart 4 + +++ b/packages/flutter_tools/lib/src/flutter_cache.dart 5 + @@ -51,14 +51,6 @@ class FlutterCache extends Cache { 6 + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); 7 + } 8 + registerArtifact(FontSubsetArtifacts(this, platform: platform)); 9 + - registerArtifact(PubDependencies( 10 + - logger: logger, 11 + - // flutter root and pub must be lazily initialized to avoid accessing 12 + - // before the version is determined. 13 + - flutterRoot: () => Cache.flutterRoot!, 14 + - pub: () => pub, 15 + - projectFactory: projectFactory, 16 + - )); 17 + } 18 + } 19 +
+37
pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart 2 + index b7e624b4e2..edfdde118b 100644 3 + --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart 4 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart 5 + @@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and 6 + 7 + // Populate the cache. We call this before pub get below so that the 8 + // sky_engine package is available in the flutter cache for pub to find. 9 + - if (shouldUpdateCache) { 10 + + if (false) { 11 + // First always update universal artifacts, as some of these (e.g. 12 + // ios-deploy on macOS) are required to determine `requiredArtifacts`. 13 + final bool offline; 14 + diff --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 5d6d78639f..90a4dfa555 100644 16 + --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 17 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 18 + @@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 19 + globals.flutterUsage.suppressAnalytics = true; 20 + } 21 + 22 + - globals.flutterVersion.ensureVersionFile(); 23 + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; 24 + final bool ci = await globals.botDetector.isRunningOnBot; 25 + final bool redirectedCompletion = !globals.stdio.hasTerminal && 26 + @@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 27 + final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; 28 + final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; 29 + 30 + - if (topLevelResults.command?.name != 'upgrade' && 31 + - (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { 32 + - await globals.flutterVersion.checkFlutterVersionFreshness(); 33 + - } 34 + - 35 + // See if the user specified a specific device. 36 + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; 37 + if (specifiedDeviceId != null) {
+19
pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart 2 + index 252021cf78..e50ef0885d 100644 3 + --- a/packages/flutter_tools/lib/src/flutter_cache.dart 4 + +++ b/packages/flutter_tools/lib/src/flutter_cache.dart 5 + @@ -51,14 +51,6 @@ class FlutterCache extends Cache { 6 + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); 7 + } 8 + registerArtifact(FontSubsetArtifacts(this, platform: platform)); 9 + - registerArtifact(PubDependencies( 10 + - logger: logger, 11 + - // flutter root and pub must be lazily initialized to avoid accessing 12 + - // before the version is determined. 13 + - flutterRoot: () => Cache.flutterRoot!, 14 + - pub: () => pub, 15 + - projectFactory: projectFactory, 16 + - )); 17 + } 18 + } 19 +
+37
pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart 2 + index b7e624b4e2..edfdde118b 100644 3 + --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart 4 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart 5 + @@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and 6 + 7 + // Populate the cache. We call this before pub get below so that the 8 + // sky_engine package is available in the flutter cache for pub to find. 9 + - if (shouldUpdateCache) { 10 + + if (false) { 11 + // First always update universal artifacts, as some of these (e.g. 12 + // ios-deploy on macOS) are required to determine `requiredArtifacts`. 13 + final bool offline; 14 + diff --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 5d6d78639f..90a4dfa555 100644 16 + --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 17 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 18 + @@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 19 + globals.flutterUsage.suppressAnalytics = true; 20 + } 21 + 22 + - globals.flutterVersion.ensureVersionFile(); 23 + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; 24 + final bool ci = await globals.botDetector.isRunningOnBot; 25 + final bool redirectedCompletion = !globals.stdio.hasTerminal && 26 + @@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 27 + final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; 28 + final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; 29 + 30 + - if (topLevelResults.command?.name != 'upgrade' && 31 + - (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { 32 + - await globals.flutterVersion.checkFlutterVersionFreshness(); 33 + - } 34 + - 35 + // See if the user specified a specific device. 36 + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; 37 + if (specifiedDeviceId != null) {
+19
pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart 2 + index 252021cf78..e50ef0885d 100644 3 + --- a/packages/flutter_tools/lib/src/flutter_cache.dart 4 + +++ b/packages/flutter_tools/lib/src/flutter_cache.dart 5 + @@ -51,14 +51,6 @@ class FlutterCache extends Cache { 6 + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); 7 + } 8 + registerArtifact(FontSubsetArtifacts(this, platform: platform)); 9 + - registerArtifact(PubDependencies( 10 + - logger: logger, 11 + - // flutter root and pub must be lazily initialized to avoid accessing 12 + - // before the version is determined. 13 + - flutterRoot: () => Cache.flutterRoot!, 14 + - pub: () => pub, 15 + - projectFactory: projectFactory, 16 + - )); 17 + } 18 + } 19 +
+37
pkgs/development/compilers/flutter/versions/3_23/patches/disable-auto-update.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart 2 + index b7e624b4e2..edfdde118b 100644 3 + --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart 4 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart 5 + @@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and 6 + 7 + // Populate the cache. We call this before pub get below so that the 8 + // sky_engine package is available in the flutter cache for pub to find. 9 + - if (shouldUpdateCache) { 10 + + if (false) { 11 + // First always update universal artifacts, as some of these (e.g. 12 + // ios-deploy on macOS) are required to determine `requiredArtifacts`. 13 + final bool offline; 14 + diff --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 5d6d78639f..90a4dfa555 100644 16 + --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 17 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 18 + @@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 19 + globals.flutterUsage.suppressAnalytics = true; 20 + } 21 + 22 + - globals.flutterVersion.ensureVersionFile(); 23 + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; 24 + final bool ci = await globals.botDetector.isRunningOnBot; 25 + final bool redirectedCompletion = !globals.stdio.hasTerminal && 26 + @@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { 27 + final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; 28 + final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; 29 + 30 + - if (topLevelResults.command?.name != 'upgrade' && 31 + - (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { 32 + - await globals.flutterVersion.checkFlutterVersionFreshness(); 33 + - } 34 + - 35 + // See if the user specified a specific device. 36 + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; 37 + if (specifiedDeviceId != null) {
+19
pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart 2 + index 252021cf78..e50ef0885d 100644 3 + --- a/packages/flutter_tools/lib/src/flutter_cache.dart 4 + +++ b/packages/flutter_tools/lib/src/flutter_cache.dart 5 + @@ -51,14 +51,6 @@ class FlutterCache extends Cache { 6 + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); 7 + } 8 + registerArtifact(FontSubsetArtifacts(this, platform: platform)); 9 + - registerArtifact(PubDependencies( 10 + - logger: logger, 11 + - // flutter root and pub must be lazily initialized to avoid accessing 12 + - // before the version is determined. 13 + - flutterRoot: () => Cache.flutterRoot!, 14 + - pub: () => pub, 15 + - projectFactory: projectFactory, 16 + - )); 17 + } 18 + } 19 +
+30
pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch
··· 1 + diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart 2 + index e4e474ab6e..5548599802 100644 3 + --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart 4 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart 5 + @@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and 6 + 7 + // Populate the cache. We call this before pub get below so that the 8 + // sky_engine package is available in the flutter cache for pub to find. 9 + - if (shouldUpdateCache) { 10 + + if (false) { 11 + // First always update universal artifacts, as some of these (e.g. 12 + // ios-deploy on macOS) are required to determine `requiredArtifacts`. 13 + final bool offline; 14 + diff --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 50783f8435..db94062840 100644 16 + --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 17 + +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart 18 + @@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> { 19 + globals.analytics.suppressTelemetry(); 20 + } 21 + 22 + - globals.flutterVersion.ensureVersionFile(); 23 + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; 24 + - if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { 25 + - await globals.flutterVersion.checkFlutterVersionFreshness(); 26 + - } 27 + 28 + // See if the user specified a specific device. 29 + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; 30 +