Merge pull request #311815 from ExpidusOS/feat/flutter-3.22.0

flutter: 3.19.4 -> 3.22.0
NixOS · May 19, 2024 · 6c0b7a9 · 6c0b7a9
2 parents f49aee6 + a22a985
commit 6c0b7a9
Show file tree

Hide file tree

Showing 7 changed files with 1,078 additions and 6 deletions.
diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix
@@ -1,6 +1,6 @@
 { lib
 , fetchFromGitHub
-, flutter
+, flutterPackages
 , corrosion
 , rustPlatform
 , cargo
@@ -9,7 +9,7 @@
 , copyDesktopItems
 , makeDesktopItem
 }:
-flutter.buildFlutterApplication rec {
+flutterPackages.v3_19.buildFlutterApplication rec {
   pname = "intiface-central";
   version = "2.5.6";
   src = fetchFromGitHub {

diff --git a/pkgs/desktops/expidus/default.nix b/pkgs/desktops/expidus/default.nix
@@ -1,5 +1,10 @@
-{ callPackage }:
+{ callPackage, flutterPackages }:
 {
-  calculator = callPackage ./calculator {};
-  file-manager = callPackage ./file-manager {};
+  calculator = callPackage ./calculator {
+    flutter = flutterPackages.v3_19;
+  };
+
+  file-manager = callPackage ./file-manager {
+    flutter = flutterPackages.v3_19;
+  };
 }
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
@@ -141,7 +141,9 @@ let
         homepage = "https://flutter.dev";
         license = licenses.bsd3;
         platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-        maintainers = with maintainers; [ babariviere ericdallo FlafyDev hacker1024 ];
+        maintainers = teams.flutter.members ++ (with maintainers; [
+          babariviere ericdallo
+        ]);
       };
     };
 in