diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 4a369c142f02..1447ce070196 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -8,6 +8,7 @@ makeDesktopItem, copyDesktopItems, makeWrapper, + jdk17_headless, }: let # fetch simple-icons directly to avoid cloning with submodules, @@ -17,14 +18,14 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.3.2"; + version = "4.3.5"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; tag = "auth-v${version}"; - hash = "sha256-/WWodQcMibwXVexI+XbTZYRkIMtfNHk3bJVBPJHcoqI="; + hash = "sha256-kM1y3Q5Z8J84qHhki9A+I/uY7xYQNMlfh2ZhxzpUBHM="; }; sourceRoot = "${src.name}/auth"; @@ -51,6 +52,12 @@ flutter324.buildFlutterApplication rec { webkitgtk_4_0 sqlite libayatana-appindicator + # The networking client used by ente-auth (native_dio_adapter) + # introduces a transitive dependency on Java, which technically + # is only needed for the Android implementation. + # Unfortunately, attempts to remove it from the build entirely were + # unsuccessful. + jdk17_headless # JDK version used by upstream CI ]; # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml @@ -84,6 +91,9 @@ flutter324.buildFlutterApplication rec { # For backwards compatibility ln -s $out/bin/enteauth $out/bin/ente_auth + + # Not required at runtime as it's only used on Android + rm $out/app/ente-auth/lib/libdartjni.so ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index e04e4f9a1544..7656e78bcddf 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -356,6 +356,16 @@ "source": "hosted", "version": "3.1.1" }, + "cronet_http": { + "dependency": "transitive", + "description": { + "name": "cronet_http", + "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, "cross_file": { "dependency": "transitive", "description": { @@ -386,6 +396,16 @@ "source": "hosted", "version": "1.0.0" }, + "cupertino_http": { + "dependency": "transitive", + "description": { + "name": "cupertino_http", + "sha256": "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "dart_style": { "dependency": "transitive", "description": { @@ -430,11 +450,11 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", @@ -1073,6 +1093,16 @@ "source": "hosted", "version": "4.0.2" }, + "http_profile": { + "dependency": "transitive", + "description": { + "name": "http_profile", + "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, "image": { "dependency": "transitive", "description": { @@ -1103,6 +1133,16 @@ "source": "hosted", "version": "1.0.4" }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, "js": { "dependency": "transitive", "description": { @@ -1323,6 +1363,16 @@ "source": "hosted", "version": "1.0.2" }, + "native_dio_adapter": { + "dependency": "direct main", + "description": { + "name": "native_dio_adapter", + "sha256": "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, "nested": { "dependency": "transitive", "description": { @@ -1343,6 +1393,16 @@ "source": "hosted", "version": "0.5.0" }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "otp": { "dependency": "direct main", "description": {