diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 9a81496f7953..1b557af51573 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -1,26 +1,39 @@ { lib, fetchFromGitHub, - flutter329, + flutter332, corrosion, rustPlatform, cargo, rustc, + jdk, udev, + zlib, copyDesktopItems, makeDesktopItem, + runCommand, }: -flutter329.buildFlutterApplication rec { +let + zlib-root = runCommand "zlib-root" { } '' + mkdir $out + ln -s ${zlib.dev}/include $out/include + ln -s ${zlib}/lib $out/lib + ''; + pname = "intiface-central"; - version = "2.6.7"; + + version = "2.6.8-unstable-2025-09-14"; src = fetchFromGitHub { owner = "intiface"; repo = "intiface-central"; - tag = "v${version}"; - hash = "sha256-ePk0I6Uf2/eaBKSZumv/kF9MJOB+MWQ4/FnQ19lE3ZQ="; + rev = "17877c623ad7e47fccfbb0acd6d191d672dc5053"; + hash = "sha256-sXvV3T/3Po2doDWXxiiJhAbQidwPPTS5300tEbgP83g="; }; +in +flutter332.buildFlutterApplication { + inherit pname version src; patches = [ ./corrosion.patch @@ -29,10 +42,9 @@ flutter329.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; cargoDeps = rustPlatform.fetchCargoVendor { - name = "${pname}-${version}-cargo-deps"; - inherit src; + inherit pname version src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-EC0pdTG+BsVFbxixCeOIXCsMHi4pF3tug+YNVzaMn/A="; + hash = "sha256-S+TonMTj3xb9oVo17hfjbl448pEvR+3sTTI8ePFjYXk="; }; cargoRoot = "intiface-engine-flutter-bridge"; @@ -49,7 +61,12 @@ flutter329.buildFlutterApplication rec { copyDesktopItems ]; - buildInputs = [ udev ]; + buildInputs = [ + jdk + udev + ]; + + env.ZLIB_ROOT = zlib-root; # without this, only the splash screen will be shown and the logs will contain the # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json index 61df5b91b15f..9e5b366d4c88 100644 --- a/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json @@ -44,11 +44,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.12.0" + "version": "2.13.0" }, "bloc": { "dependency": "direct main", @@ -354,11 +354,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3" }, "ffi": { "dependency": "direct main", @@ -648,6 +648,16 @@ "source": "hosted", "version": "1.0.5" }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "d2c361082d554d4593c3012e26f6b188f902acd291330f13d6427641a92b3da1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.2" + }, "js": { "dependency": "transitive", "description": { @@ -682,11 +692,11 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.8" + "version": "10.0.9" }, "leak_tracker_flutter_testing": { "dependency": "transitive", @@ -1132,21 +1142,21 @@ "dependency": "direct main", "description": { "name": "sentry", - "sha256": "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb", + "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.14.2" + "version": "9.6.0" }, "sentry_flutter": { "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8", + "sha256": "37deb4ef8837d10b5c1f527ec18591f8d2d2da9c34f19b3d97ccbbe7f84077c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.14.2" + "version": "9.6.0" }, "settings_ui": { "dependency": "direct main", @@ -1518,11 +1528,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.1" + "version": "15.0.0" }, "watcher": { "dependency": "transitive", @@ -1538,21 +1548,21 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.1" }, "web_socket_channel": { "dependency": "direct main", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.4.0" }, "win32": { "dependency": "transitive", diff --git a/pkgs/by-name/in/intiface-central/update.sh b/pkgs/by-name/in/intiface-central/update.sh index 5907e0ae5628..f946ff71786a 100755 --- a/pkgs/by-name/in/intiface-central/update.sh +++ b/pkgs/by-name/in/intiface-central/update.sh @@ -1,14 +1,14 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update +#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update set -eou pipefail -ROOT="$(dirname "$(readlink -f "$0")")" +PACKAGE_DIR=$(realpath "$(dirname "$0")") -latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/intiface/intiface-central/releases/latest | jq --raw-output .tag_name) +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/intiface/intiface-central/releases/latest | jq --raw-output .tag_name) latestVersion=$(echo "$latestTag" | sed 's/^v//') -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; intiface-central.version or (lib.getVersion intiface-central)" | tr -d '"') +currentVersion=$(nix eval --raw --file . intiface-central.version) if [[ "$currentVersion" == "$latestVersion" ]]; then echo "package is up-to-date: $currentVersion" @@ -17,4 +17,4 @@ fi nix-update intiface-central --version $latestVersion -curl https://raw.githubusercontent.com/intiface/intiface-central/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json +curl --fail --silent https://raw.githubusercontent.com/intiface/intiface-central/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json