Merge pull request #230674 from afh/update-yubioath-flutter

yubioath-flutter: 6.1.0 -> 6.2.0

pkgs/applications/misc/yubioath-flutter/default.nix

@@ -3,6 +3,9 @@
 , python3
 , fetchFromGitHub
 , pcre2
+, libnotify
+, libappindicator
+, pkg-config
 , gnome
 , makeWrapper
 , removeReferencesTo
@@ -10,19 +13,19 @@
 
 flutter37.buildFlutterApplication rec {
   pname = "yubioath-flutter";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubioath-flutter";
     rev = version;
-    sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI=";
+    hash = "sha256-NgzijuvyWNl9sFQzq1Jzk1povF8c/rKuVyVKeve+Vic=";
   };
 
   passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
 
   depsListFile = ./deps.json;
-  vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8=";
+  vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA=";
 
   postPatch = ''
     substituteInPlace linux/CMakeLists.txt \
@@ -68,10 +71,13 @@ flutter37.buildFlutterApplication rec {
   nativeBuildInputs = [
     makeWrapper
     removeReferencesTo
+    pkg-config
   ];
 
   buildInputs = [
     pcre2
+    libnotify
+    libappindicator
   ];
 
   disallowedReferences = [

pkgs/applications/misc/yubioath-flutter/deps.json

@@ -1,7 +1,7 @@
 [
   {
     "name": "yubico_authenticator",
-    "version": "6.1.0+60100",
+    "version": "6.2.0+60200",
     "kind": "root",
     "source": "root",
     "dependencies": [
@@ -17,8 +17,18 @@
       "freezed_annotation",
       "window_manager",
       "qrscanner_zxing",
+      "screen_retriever",
       "desktop_drop",
       "url_launcher",
+      "path_provider",
+      "vector_graphics",
+      "vector_graphics_compiler",
+      "path",
+      "file_picker",
+      "archive",
+      "crypto",
+      "tray_manager",
+      "local_notifier",
       "integration_test",
       "flutter_test",
       "flutter_lints",
@@ -29,7 +39,7 @@
   },
   {
     "name": "json_serializable",
-    "version": "6.5.4",
+    "version": "6.6.1",
     "kind": "dev",
     "source": "hosted",
     "dependencies": [
@@ -60,7 +70,7 @@
   },
   {
     "name": "source_gen",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -69,7 +79,6 @@
       "build",
       "dart_style",
       "glob",
-      "meta",
       "path",
       "source_span",
       "yaml"
@@ -116,7 +125,7 @@
   {
     "name": "path",
     "version": "1.8.2",
-    "kind": "transitive",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": []
   },
@@ -127,16 +136,9 @@
     "source": "hosted",
     "dependencies": []
   },
-  {
-    "name": "meta",
-    "version": "1.8.0",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
   {
     "name": "glob",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -157,6 +159,13 @@
       "path"
     ]
   },
+  {
+    "name": "meta",
+    "version": "1.8.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "async",
     "version": "2.10.0",
@@ -192,14 +201,14 @@
   },
   {
     "name": "args",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
   },
   {
     "name": "analyzer",
-    "version": "5.2.0",
+    "version": "5.6.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -239,7 +248,7 @@
   {
     "name": "crypto",
     "version": "3.0.2",
-    "kind": "transitive",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "typed_data"
@@ -265,7 +274,7 @@
   },
   {
     "name": "_fe_analyzer_shared",
-    "version": "50.0.0",
+    "version": "54.0.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -290,7 +299,7 @@
   },
   {
     "name": "logging",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": []
@@ -310,7 +319,7 @@
   },
   {
     "name": "json_annotation",
-    "version": "4.7.0",
+    "version": "4.8.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -319,7 +328,7 @@
   },
   {
     "name": "checked_yaml",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -412,7 +421,7 @@
   },
   {
     "name": "web_socket_channel",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -432,7 +441,7 @@
   },
   {
     "name": "timing",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -504,7 +513,7 @@
   },
   {
     "name": "mime",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -520,7 +529,7 @@
   },
   {
     "name": "io",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -559,7 +568,7 @@
   },
   {
     "name": "code_builder",
-    "version": "4.3.0",
+    "version": "4.4.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -582,7 +591,7 @@
   },
   {
     "name": "built_value",
-    "version": "8.4.2",
+    "version": "8.4.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -594,7 +603,7 @@
   },
   {
     "name": "fixnum",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": []
@@ -634,13 +643,14 @@
   },
   {
     "name": "build_resolvers",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
       "analyzer",
       "async",
       "build",
+      "collection",
       "crypto",
       "graphs",
       "logging",
@@ -654,7 +664,7 @@
   },
   {
     "name": "build_daemon",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -861,7 +871,7 @@
   {
     "name": "archive",
     "version": "3.3.2",
-    "kind": "transitive",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "crypto",
@@ -945,44 +955,86 @@
     ]
   },
   {
-    "name": "url_launcher",
-    "version": "6.1.7",
+    "name": "local_notifier",
+    "version": "0.1.5",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "url_launcher_android",
-      "url_launcher_ios",
-      "url_launcher_linux",
-      "url_launcher_macos",
-      "url_launcher_platform_interface",
-      "url_launcher_web",
-      "url_launcher_windows"
+      "uuid"
     ]
   },
   {
-    "name": "url_launcher_windows",
-    "version": "3.0.1",
+    "name": "uuid",
+    "version": "3.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "flutter",
-      "url_launcher_platform_interface"
+      "crypto"
     ]
   },
   {
-    "name": "url_launcher_platform_interface",
-    "version": "2.1.1",
-    "kind": "transitive",
+    "name": "tray_manager",
+    "version": "0.2.0",
+    "kind": "direct",
     "source": "hosted",
     "dependencies": [
       "flutter",
-      "plugin_platform_interface"
+      "menu_base",
+      "path",
+      "shortid"
     ]
   },
+  {
+    "name": "shortid",
+    "version": "0.1.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "menu_base",
+    "version": "0.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
+  {
+    "name": "file_picker",
+    "version": "5.2.7",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "flutter_plugin_android_lifecycle",
+      "plugin_platform_interface",
+      "ffi",
+      "path",
+      "win32"
+    ]
+  },
+  {
+    "name": "win32",
+    "version": "3.1.3",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi"
+    ]
+  },
+  {
+    "name": "ffi",
+    "version": "2.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
   {
     "name": "plugin_platform_interface",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -990,14 +1042,12 @@
     ]
   },
   {
-    "name": "url_launcher_web",
-    "version": "2.0.13",
+    "name": "flutter_plugin_android_lifecycle",
+    "version": "2.0.7",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
-      "flutter",
-      "flutter_web_plugins",
-      "url_launcher_platform_interface"
+      "flutter"
     ]
   },
   {
@@ -1015,9 +1065,198 @@
       "vector_math"
     ]
   },
+  {
+    "name": "vector_graphics_compiler",
+    "version": "1.1.4",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "args",
+      "meta",
+      "path_parsing",
+      "xml",
+      "vector_graphics_codec"
+    ]
+  },
+  {
+    "name": "vector_graphics_codec",
+    "version": "1.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": []
+  },
+  {
+    "name": "xml",
+    "version": "6.2.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "collection",
+      "meta",
+      "petitparser"
+    ]
+  },
+  {
+    "name": "petitparser",
+    "version": "5.1.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta"
+    ]
+  },
+  {
+    "name": "path_parsing",
+    "version": "1.0.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "vector_math",
+      "meta"
+    ]
+  },
+  {
+    "name": "vector_graphics",
+    "version": "1.1.4",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "vector_graphics_codec"
+    ]
+  },
+  {
+    "name": "path_provider",
+    "version": "2.0.14",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "path_provider_android",
+      "path_provider_foundation",
+      "path_provider_linux",
+      "path_provider_platform_interface",
+      "path_provider_windows"
+    ]
+  },
+  {
+    "name": "path_provider_windows",
+    "version": "2.1.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "flutter",
+      "path",
+      "path_provider_platform_interface",
+      "win32"
+    ]
+  },
+  {
+    "name": "path_provider_platform_interface",
+    "version": "2.0.6",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "platform",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "path_provider_linux",
+    "version": "2.1.9",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "ffi",
+      "flutter",
+      "path",
+      "path_provider_platform_interface",
+      "xdg_directories"
+    ]
+  },
+  {
+    "name": "xdg_directories",
+    "version": "1.0.0",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "meta",
+      "path",
+      "process"
+    ]
+  },
+  {
+    "name": "path_provider_foundation",
+    "version": "2.1.1",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "path_provider_platform_interface"
+    ]
+  },
+  {
+    "name": "path_provider_android",
+    "version": "2.0.22",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "path_provider_platform_interface"
+    ]
+  },
+  {
+    "name": "url_launcher",
+    "version": "6.1.10",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "url_launcher_android",
+      "url_launcher_ios",
+      "url_launcher_linux",
+      "url_launcher_macos",
+      "url_launcher_platform_interface",
+      "url_launcher_web",
+      "url_launcher_windows"
+    ]
+  },
+  {
+    "name": "url_launcher_windows",
+    "version": "3.0.4",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "url_launcher_platform_interface"
+    ]
+  },
+  {
+    "name": "url_launcher_platform_interface",
+    "version": "2.1.2",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "plugin_platform_interface"
+    ]
+  },
+  {
+    "name": "url_launcher_web",
+    "version": "2.0.15",
+    "kind": "transitive",
+    "source": "hosted",
+    "dependencies": [
+      "flutter",
+      "flutter_web_plugins",
+      "url_launcher_platform_interface"
+    ]
+  },
   {
     "name": "url_launcher_macos",
-    "version": "3.0.1",
+    "version": "3.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1027,7 +1266,7 @@
   },
   {
     "name": "url_launcher_linux",
-    "version": "3.0.1",
+    "version": "3.0.3",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1037,7 +1276,7 @@
   },
   {
     "name": "url_launcher_ios",
-    "version": "6.0.17",
+    "version": "6.1.1",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1047,7 +1286,7 @@
   },
   {
     "name": "url_launcher_android",
-    "version": "6.0.22",
+    "version": "6.0.24",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1057,7 +1296,7 @@
   },
   {
     "name": "desktop_drop",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1068,7 +1307,7 @@
   },
   {
     "name": "cross_file",
-    "version": "0.3.3+2",
+    "version": "0.3.3+4",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1076,6 +1315,15 @@
       "meta"
     ]
   },
+  {
+    "name": "screen_retriever",
+    "version": "0.1.6",
+    "kind": "direct",
+    "source": "hosted",
+    "dependencies": [
+      "flutter"
+    ]
+  },
   {
     "name": "qrscanner_zxing",
     "version": "1.0.0",
@@ -1088,7 +1336,7 @@
   },
   {
     "name": "window_manager",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1097,18 +1345,9 @@
       "screen_retriever"
     ]
   },
-  {
-    "name": "screen_retriever",
-    "version": "0.1.4",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter"
-    ]
-  },
   {
     "name": "flutter_riverpod",
-    "version": "2.1.3",
+    "version": "2.3.2",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1130,7 +1369,7 @@
   },
   {
     "name": "riverpod",
-    "version": "2.1.3",
+    "version": "2.3.2",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1142,7 +1381,7 @@
   },
   {
     "name": "shared_preferences",
-    "version": "2.0.16",
+    "version": "2.1.0",
     "kind": "direct",
     "source": "hosted",
     "dependencies": [
@@ -1157,7 +1396,7 @@
   },
   {
     "name": "shared_preferences_windows",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1171,7 +1410,7 @@
   },
   {
     "name": "shared_preferences_platform_interface",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1179,49 +1418,9 @@
       "plugin_platform_interface"
     ]
   },
-  {
-    "name": "path_provider_windows",
-    "version": "2.1.3",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "flutter",
-      "path",
-      "path_provider_platform_interface",
-      "win32"
-    ]
-  },
-  {
-    "name": "win32",
-    "version": "3.1.2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi"
-    ]
-  },
-  {
-    "name": "ffi",
-    "version": "2.0.1",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": []
-  },
-  {
-    "name": "path_provider_platform_interface",
-    "version": "2.0.5",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "flutter",
-      "platform",
-      "plugin_platform_interface"
-    ]
-  },
   {
     "name": "shared_preferences_web",
-    "version": "2.0.4",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1232,7 +1431,7 @@
   },
   {
     "name": "shared_preferences_linux",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1244,33 +1443,9 @@
       "shared_preferences_platform_interface"
     ]
   },
-  {
-    "name": "path_provider_linux",
-    "version": "2.1.7",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "ffi",
-      "flutter",
-      "path",
-      "path_provider_platform_interface",
-      "xdg_directories"
-    ]
-  },
-  {
-    "name": "xdg_directories",
-    "version": "0.2.0+2",
-    "kind": "transitive",
-    "source": "hosted",
-    "dependencies": [
-      "meta",
-      "path",
-      "process"
-    ]
-  },
   {
     "name": "shared_preferences_foundation",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [
@@ -1280,7 +1455,7 @@
   },
   {
     "name": "shared_preferences_android",
-    "version": "2.0.14",
+    "version": "2.1.0",
     "kind": "transitive",
     "source": "hosted",
     "dependencies": [

pkgs/applications/misc/yubioath-flutter/helper.nix

@@ -1,4 +1,5 @@
 { buildPythonApplication
+, python3
 , poetry-core
 , yubikey-manager
 , fido2
@@ -19,13 +20,16 @@ buildPythonApplication {
   sourceRoot = "${src.name}/helper";
   format = "pyproject";
 
+  nativeBuildInputs = [
+    python3.pkgs.pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = true;
+
   postPatch = ''
-    sed -i \
-      -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \
-      -e 's,mss = .*,mss = "*",g' \
-      -e 's,yubikey-manager = .*,yubikey-manager = "*",g' \
-      -e 's,Pillow = .*,Pillow = "*",g' \
-      pyproject.toml
+    substituteInPlace pyproject.toml \
+      --replace "authenticator-helper" "yubioath-flutter-helper" \
+      --replace "0.1.0" "${version}"
   '';
 
   postInstall = ''

pkgs/development/compilers/flutter/engine-artifacts/default.nix

@@ -19,10 +19,14 @@ let
     version = engineVersion;
     dontUnpack = true;
     src = fetchurl {
+      pname = "flutter-sky_engine-LICENSE";
+      version = engineVersion;
       url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE";
       sha256 = hashes.skyNotice;
     };
     flutterNotice = fetchurl {
+      pname = "flutter-LICENSE";
+      version = engineVersion;
       url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE";
       sha256 = hashes.flutterNotice;
     };

pkgs/development/compilers/flutter/engine-artifacts/hashes.nix

@@ -1,6 +1,6 @@
 {
   "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
-    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    skyNotice = "sha256-+EitMZAAvJ1mIlfm5ZTfY+pk8tfyu33XM7P8qOdj+J8=";
     flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";