From 809f76d0821d274c0dda8a133b6eb9f9fec3df6e Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 13 May 2025 05:21:13 +0800 Subject: [PATCH 1/2] flutter332: 3.32.0-0.3.pre -> 3.32.0-0.4.pre --- .../compilers/flutter/versions/3_32/data.json | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json index 4b043c476356..42781fe3577d 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/data.json +++ b/pkgs/development/compilers/flutter/versions/3_32/data.json @@ -1,73 +1,73 @@ { - "version": "3.32.0-0.3.pre", - "engineVersion": "453dd7174cc6555e3e9eb5f006c86e6ec221a0d2", + "version": "3.32.0-0.4.pre", + "engineVersion": "38e19d01dcac654bbb941b771cc06efd4ed4a93f", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "beta", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-ql8yUGCPMhFI2+pfVtTZFXpb5WDKq8jAzhr0X6LXE7A=", - "x86_64-linux": "sha256-ql8yUGCPMhFI2+pfVtTZFXpb5WDKq8jAzhr0X6LXE7A=" + "aarch64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q=", + "x86_64-linux": "sha256-qAibCHpb582058h/62f3/EnWrKDMrci0dUrEc2BjE6Q=" }, "x86_64-linux": { - "aarch64-linux": "sha256-JWv1aHPOcw2qBN0Jjn6kIMCF8hZYlh6ZbGLVa0GP5NE=", - "x86_64-linux": "sha256-JWv1aHPOcw2qBN0Jjn6kIMCF8hZYlh6ZbGLVa0GP5NE=" + "aarch64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA=", + "x86_64-linux": "sha256-hekNsaCiB7cKuD9+6coKs556KfNnkcPtuOIYI5lC1NA=" } }, - "dartVersion": "3.8.0-278.2.beta", + "dartVersion": "3.8.0-278.4.beta", "dartHash": { - "x86_64-linux": "sha256-ux89ySr218exFOhscGhumXC1Eizdk6hvpWwxPTJDAFo=", - "aarch64-linux": "sha256-Ggc7HOytWwqimOKFUu4+CKtz0L4F09/fXY5BkeS/HAw=", - "x86_64-darwin": "sha256-etOXUGIDL4n7PmuH+g74ByXuuWjJ8JnT4iwGm4rPXYQ=", - "aarch64-darwin": "sha256-+7Eewv0x+V6gDqyfj5/z50whBU8NrvdidOWPPeaEAwE=" + "x86_64-linux": "sha256-jyLGethyv9KGGV9IjlXnSno6oJTwUFpR8wsgVbT+UTY=", + "aarch64-linux": "sha256-NEYfdqLA5+Po9fI0YfAbsXPMgaEkhkDfm2XHOROU4MM=", + "x86_64-darwin": "sha256-09AvWYmW2LHaUe2hTv/EVGwjY6GTCV7reiqUVQKDkrM=", + "aarch64-darwin": "sha256-IwJJGFW+hdt7Yb86DdGxWjiEp0XJnLJUzqJvKrN9iTs=" }, - "flutterHash": "sha256-FqJR0PQYks2njzMgZCQSQqy2Goqp6QeN8Ej4a4EHVes=", + "flutterHash": "sha256-+UQNtN0BrSxEwGdnb9f63Bg46q+zKwqStYBKgIB/hic=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-A5AUxqKHwUYm9Mf6cqTAazCxGP+JwGpIfeMZ7vIqQUs=", - "aarch64-linux": "sha256-WQ7gM4i2UuaYaciT67HwYL7McBGXLYdZn748Mkghbxw=", - "x86_64-darwin": "sha256-A5AUxqKHwUYm9Mf6cqTAazCxGP+JwGpIfeMZ7vIqQUs=", - "x86_64-linux": "sha256-WQ7gM4i2UuaYaciT67HwYL7McBGXLYdZn748Mkghbxw=" + "aarch64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=", + "aarch64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE=", + "x86_64-darwin": "sha256-bknwCOFzj6Qj63I4VwTvuedmvLjdvCDdSpf9fFiRha0=", + "x86_64-linux": "sha256-tHl0+NBCDcn/JJ+XJ8Ow5yFHK3UiUIzpjCuOddgVEiE=" }, "fuchsia": { - "aarch64-darwin": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=", - "aarch64-linux": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=", - "x86_64-darwin": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=", - "x86_64-linux": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=" + "aarch64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=", + "aarch64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=", + "x86_64-darwin": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=", + "x86_64-linux": "sha256-JkxTpBlkmlq+ENnUBqRTGITVjHsicPN1p99XlGhdCPc=" }, "ios": { - "aarch64-darwin": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=", - "aarch64-linux": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=", - "x86_64-darwin": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=", - "x86_64-linux": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=" + "aarch64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=", + "aarch64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=", + "x86_64-darwin": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=", + "x86_64-linux": "sha256-PlFE5eoLdJOsnWR5QfENrGR0WQ0nP7ZkeBMbjpD12GU=" }, "linux": { - "aarch64-darwin": "sha256-Uo+NABCVVTI2aAlhoWJ4N9M+wXUtATA0bjKOhK3df84=", - "aarch64-linux": "sha256-Uo+NABCVVTI2aAlhoWJ4N9M+wXUtATA0bjKOhK3df84=", - "x86_64-darwin": "sha256-LsBWcZtzxbULYSqsUAik3DMNX8BON88udrIownJVnDo=", - "x86_64-linux": "sha256-LsBWcZtzxbULYSqsUAik3DMNX8BON88udrIownJVnDo=" + "aarch64-darwin": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=", + "aarch64-linux": "sha256-GLG6kNllEwbdsF1pJ5MPZ14Pqpw2nCkadthECfk6FD8=", + "x86_64-darwin": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU=", + "x86_64-linux": "sha256-aq/yB8vH9lQwv2sbVg0PlZBuLOUTeO0ptuEqBJuUUvU=" }, "macos": { - "aarch64-darwin": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=", - "aarch64-linux": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=", - "x86_64-darwin": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=", - "x86_64-linux": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=" + "aarch64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=", + "aarch64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=", + "x86_64-darwin": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=", + "x86_64-linux": "sha256-XMtNe03SXtmBc9i588N7BTRg/xqLCohEjovDXHC1hpI=" }, "universal": { - "aarch64-darwin": "sha256-dIpU21J5zVQCQJWRINXleC7b480IHY5/8KZzBCi9TVc=", - "aarch64-linux": "sha256-/O/eAYa6KZwXG/w3sN2Egla+xBMqJ8hFAQktQjcVHxo=", - "x86_64-darwin": "sha256-9+I7GjB2ZX6gZsmxij1XB+iA0VYjoKJt4NFK22ooYes=", - "x86_64-linux": "sha256-ApqDXK7BVUDJY612PNn2SqX8fvHESYGv5pl0814+uzs=" + "aarch64-darwin": "sha256-EocA/pXkEw7fe0fdDkC/WDk5JAVlwTJybNAQDw0/wO4=", + "aarch64-linux": "sha256-yIwNmd0DVsLsEUH1+W4AeJXf9l/WIC8HLbHooIZdqk0=", + "x86_64-darwin": "sha256-5Y5gRLoCzTYuP4JXf9APKbHXl+khuzleQIxNiWyVjbM=", + "x86_64-linux": "sha256-jqe3Z4caAe890CeJST9pAjgunGJsqnycGFqNvn8XNAI=" }, "web": { - "aarch64-darwin": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=", - "aarch64-linux": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=", - "x86_64-darwin": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=", - "x86_64-linux": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=" + "aarch64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=", + "aarch64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=", + "x86_64-darwin": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=", + "x86_64-linux": "sha256-CBW+e9/dI+3Osu6AyiUrMej9/viz26nh490uHP7l9JA=" }, "windows": { - "x86_64-darwin": "sha256-nSIm4HAFn+K7CPOVtD2DTGmWfXM1t2lD5GqXa3INTQQ=", - "x86_64-linux": "sha256-nSIm4HAFn+K7CPOVtD2DTGmWfXM1t2lD5GqXa3INTQQ=" + "x86_64-darwin": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg=", + "x86_64-linux": "sha256-VUa58cPGlNstQS1QIkC8vhtdA7a/qPC9FMtFM32G2xg=" } }, "pubspecLock": { From 09d94451cadc3bc38b0771b0f9ea834e57483f66 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 13 May 2025 05:26:12 +0800 Subject: [PATCH 2/2] flutter332, flutter329: add patch --- pkgs/development/compilers/flutter/default.nix | 1 + .../3_29/patches/gradle-flutter-tools-wrapper.patch | 11 +++++++++++ .../3_32/patches/gradle-flutter-tools-wrapper.patch | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index ba42bc3f78ac..a9ce1c6939aa 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -87,6 +87,7 @@ let chmod +w $out/bin mkdir $out/bin/cache cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp + touch $out/bin/cache/engine.realm '') else source diff --git a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch index de6080efbba8..b579b4b42f8e 100644 --- a/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch +++ b/pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch @@ -42,3 +42,14 @@ index 0000000000..b2485c94b4 +""" + +includeBuild(dir) +--- a/packages/flutter_tools/gradle/build.gradle.kts ++++ b/packages/flutter_tools/gradle/build.gradle.kts +@@ -4,6 +4,8 @@ + + import org.jetbrains.kotlin.gradle.dsl.JvmTarget + ++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile ++ + plugins { + `java-gradle-plugin` + groovy diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch index de6080efbba8..b579b4b42f8e 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch +++ b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch @@ -42,3 +42,14 @@ index 0000000000..b2485c94b4 +""" + +includeBuild(dir) +--- a/packages/flutter_tools/gradle/build.gradle.kts ++++ b/packages/flutter_tools/gradle/build.gradle.kts +@@ -4,6 +4,8 @@ + + import org.jetbrains.kotlin.gradle.dsl.JvmTarget + ++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile ++ + plugins { + `java-gradle-plugin` + groovy