Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

2 files changed, 159 insertions, 140 deletions

diff --git a/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix b/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix
index ab22441984ee..6c3285e1eb10 100644
--- a/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix
@@ -1,17 +1,17 @@
 { lib, flutter, fetchFromGitHub }:
 flutter.buildFlutterApplication rec {
   pname = "expidus-file-manager";
-  version = "0.1.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "ExpidusOS";
     repo = "file-manager";
     rev = version;
-    sha256 = "sha256-aAPmwzNPgu08Ov9NyRW5bcj3jQzG9rpWwrABRyK2Weg=";
+    hash = "sha256-p/bKVC1LpvVcyI3NYjQ//QL/6UutjVg649IZSmz4w9g=";
   };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-mPGrpMUguM9XAYWH8lBQuytxZ3J0gS2XOMPkKyFMLbc=";
+  vendorHash = "sha256-m2GCLC4ZUvDdBVKjxZjelrZZHY3+R7DilOOT84Twrxg=";
 
   postInstall = ''
     rm $out/bin/file_manager
@@ -37,5 +37,6 @@ flutter.buildFlutterApplication rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ RossComputerGuy ];
     platforms = [ "x86_64-linux" "aarch64-linux" ];
+    mainProgram = "expidus-file-manager";
   };
 }
diff --git a/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json b/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json
index eb6c23b4e672..e1b391147a21 100644
--- a/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json
+++ b/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "file_manager",
-    "version": "0.1.2+1",
+    "version": "0.2.0+65656565656565",
     "kind": "root",
     "source": "root",
     "dependencies": [
@@ -29,6 +29,9 @@
       "intl",
       "provider",
       "flutter_markdown",
+      "flutter_adaptive_scaffold",
+      "package_info_plus",
+      "pub_semver",
       "flutter_test",
       "flutter_lints"
     ]
@@ -263,6 +266,124 @@
     "dependencies": []
   },
   {
+    "name": "pub_semver",
+    "version": "2.1.4",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "meta"
+    ]
+  },
+  {
+    "name": "package_info_plus",
+    "version": "3.1.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "flutter",
+      "flutter_web_plugins",
+      "http",
+      "meta",
+      "path",
+      "package_info_plus_platform_interface",
+      "win32"
+    ]
+  },
+  {
+    "name": "win32",
+    "version": "3.1.4",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "ffi"
+    ]
+  },
+  {
+    "name": "ffi",
+    "version": "2.0.2",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "package_info_plus_platform_interface",
+    "version": "2.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "meta",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "plugin_platform_interface",
+    "version": "2.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta"
+    ]
+  },
+  {
+    "name": "http",
+    "version": "0.13.6",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "async",
+      "http_parser",
+      "meta"
+    ]
+  },
+  {
+    "name": "http_parser",
+    "version": "4.0.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "source_span",
+      "string_scanner",
+      "typed_data"
+    ]
+  },
+  {
+    "name": "typed_data",
+    "version": "1.3.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection"
+    ]
+  },
+  {
+    "name": "flutter_web_plugins",
+    "version": "0.0.0",
+    "kind": "transitive",
+    "source": "sdk",
+    "dependencies": [
+      "flutter",
+      "js",
+      "characters",
+      "collection",
+      "material_color_utilities",
+      "meta",
+      "vector_math"
+    ]
+  },
+  {
+    "name": "flutter_adaptive_scaffold",
+    "version": "0.1.5",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
+  {
     "name": "flutter_markdown",
     "version": "0.6.15",
     "kind": "direct",
@@ -286,7 +407,7 @@
   },
   {
     "name": "args",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -372,16 +493,6 @@
     ]
   },
   {
-    "name": "pub_semver",
-    "version": "2.1.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection",
-      "meta"
-    ]
-  },
-  {
     "name": "sentry_flutter",
     "version": "7.7.0",
     "kind": "direct",
@@ -395,105 +506,6 @@
     ]
   },
   {
-    "name": "package_info_plus",
-    "version": "3.1.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "flutter",
-      "flutter_web_plugins",
-      "http",
-      "meta",
-      "path",
-      "package_info_plus_platform_interface",
-      "win32"
-    ]
-  },
-  {
-    "name": "win32",
-    "version": "3.1.4",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": [
-      "ffi"
-    ]
-  },
-  {
-    "name": "ffi",
-    "version": "2.0.2",
-    "kind": "direct",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "package_info_plus_platform_interface",
-    "version": "2.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "meta",
-      "plugin_platform_interface"
-    ]
-  },
-  {
-    "name": "plugin_platform_interface",
-    "version": "2.1.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "meta"
-    ]
-  },
-  {
-    "name": "http",
-    "version": "0.13.6",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "async",
-      "http_parser",
-      "meta"
-    ]
-  },
-  {
-    "name": "http_parser",
-    "version": "4.0.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection",
-      "source_span",
-      "string_scanner",
-      "typed_data"
-    ]
-  },
-  {
-    "name": "typed_data",
-    "version": "1.3.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "collection"
-    ]
-  },
-  {
-    "name": "flutter_web_plugins",
-    "version": "0.0.0",
-    "kind": "transitive",
-    "source": "sdk",
-    "dependencies": [
-      "flutter",
-      "js",
-      "characters",
-      "collection",
-      "material_color_utilities",
-      "meta",
-      "vector_math"
-    ]
-  },
-  {
     "name": "sentry",
     "version": "7.7.0",
     "kind": "transitive",
@@ -543,7 +555,7 @@
   },
   {
     "name": "path_provider_windows",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -556,7 +568,7 @@
   },
   {
     "name": "permission_handler",
-    "version": "10.2.0",
+    "version": "10.3.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -570,7 +582,7 @@
   },
   {
     "name": "permission_handler_platform_interface",
-    "version": "3.9.0",
+    "version": "3.10.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -591,7 +603,7 @@
   },
   {
     "name": "permission_handler_apple",
-    "version": "9.0.8",
+    "version": "9.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -601,7 +613,7 @@
   },
   {
     "name": "permission_handler_android",
-    "version": "10.2.2",
+    "version": "10.2.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -621,7 +633,7 @@
   },
   {
     "name": "shared_preferences",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -977,9 +989,32 @@
       "flutter",
       "material_theme_builder",
       "libtokyo",
+      "flutter_localizations",
       "path",
       "intl",
-      "filesize"
+      "filesize",
+      "bitsdojo_window",
+      "shared_preferences",
+      "pubspec",
+      "url_launcher"
+    ]
+  },
+  {
+    "name": "flutter_localizations",
+    "version": "0.0.0",
+    "kind": "direct",
+    "source": "sdk",
+    "dependencies": [
+      "flutter",
+      "intl",
+      "characters",
+      "clock",
+      "collection",
+      "js",
+      "material_color_utilities",
+      "meta",
+      "path",
+      "vector_math"
     ]
   },
   {
@@ -989,7 +1024,8 @@
     "source": "git",
     "dependencies": [
       "meta",
-      "path"
+      "path",
+      "pubspec"
     ]
   },
   {
@@ -1001,23 +1037,5 @@
       "flutter",
       "material_color_utilities"
     ]
-  },
-  {
-    "name": "flutter_localizations",
-    "version": "0.0.0",
-    "kind": "direct",
-    "source": "sdk",
-    "dependencies": [
-      "flutter",
-      "intl",
-      "characters",
-      "clock",
-      "collection",
-      "js",
-      "material_color_utilities",
-      "meta",
-      "path",
-      "vector_math"
-    ]
   }
 ]