diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json index af3ee856e9f5..ff287f73ce93 100644 --- a/pkgs/by-name/pl/plezy/git-hashes.json +++ b/pkgs/by-name/pl/plezy/git-hashes.json @@ -3,9 +3,7 @@ "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", - "background_downloader": "sha256-VHi4g/S/kCxxaeHnDTc64oS6lMHMFiU31VqFqBmdmo8=", - "connectivity_plus": "sha256-PGt4eEp32+w4XMDVwB0Kjla1OSole4l/++Zs5PHXs/U=", - "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=", - "os_media_controls": "sha256-Xd1RdtmZbuWaljNXZ/rSInQF5/F06aPtr1uVrxIdhP8=", - "wakelock_plus": "sha256-89xs0sLNuoCqApFqwEY+SEk2DUqjHf8JsSd7dfxX3P0=" + "background_downloader": "sha256-y37tzAxOwql1193E+aTJOIi2B0gXLxL3azghEYzcRGA=", + "connectivity_plus": "sha256-sVUG5/6GF0Eu47BgUCkgbGi8w1ip5o0yQS00NnNjAGs=", + "os_media_controls": "sha256-UkrBz52dkdlSJ+UJwC2E7RhuSOcXzJx+dVo0JcW8pEY=" } diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 36952fbf6120..17ef30c364d1 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -27,13 +27,13 @@ let pname = "plezy"; - version = "2.8.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "edde746"; repo = "plezy"; tag = version; - hash = "sha256-NvBCh++teOB0uNyy71NmOFwCQvkg9/v9Rx+76UybLQo="; + hash = "sha256-Fc2KWx4byfrulWzOGm0WW6EUXMvV8uwmvVjoSgzQmuA="; }; simdutf = fetchurl { @@ -55,6 +55,7 @@ let maintainers = with lib.maintainers; [ mio miniharinn + BatteredBunny ]; platforms = lib.platforms.linux ++ [ "x86_64-darwin" @@ -72,13 +73,7 @@ let gitHashes = lib.importJSON ./git-hashes.json; - # Upstream uses a sentry-dart fork that fetches sentry-native as a zip instead of via - # git clone. The PR was merged and reverted upstream (getsentry/sentry-dart#3630), so - # we use upstream since theres no actual meaningful difference - patches = [ - ./replace-sentry-fork.patch - ] - ++ lib.optionals use16kPagesizeWorkaround [ + patches = lib.optionals use16kPagesizeWorkaround [ ./16k-font-workaround.patch ]; @@ -152,7 +147,7 @@ let src = fetchurl { url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg"; - hash = "sha256-eN8CJ/yaV4wln6fN2lJqJnn+RvW+ZiD3oCDhjQjyBvU="; + hash = "sha256-jNwMukPYLTWBk1daanHtxYdJpZCB5I/hiKvFx4tL4sY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json index 55fe06f92542..46ae84a50b07 100644 --- a/pkgs/by-name/pl/plezy/pubspec.lock.json +++ b/pkgs/by-name/pl/plezy/pubspec.lock.json @@ -10,6 +10,16 @@ "source": "hosted", "version": "93.0.0" }, + "analysis_server_plugin": { + "dependency": "transitive", + "description": { + "name": "analysis_server_plugin", + "sha256": "5f3920acbd5765764ec9ef6c5bbdd102015424281232ee4fb4f5431c87abb4eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.7" + }, "analyzer": { "dependency": "transitive", "description": { @@ -108,12 +118,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859", - "resolved-ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859", + "ref": "021e2075260e324b7440a5c81b57bf0242d35020", + "resolved-ref": "021e2075260e324b7440a5c81b57bf0242d35020", "url": "https://github.com/edde746/background_downloader" }, "source": "git", - "version": "9.5.4" + "version": "9.5.5" }, "boolean_selector": { "dependency": "transitive", @@ -299,12 +309,12 @@ "dependency": "direct main", "description": { "path": "packages/connectivity_plus/connectivity_plus", - "ref": "2b614414ce95d920880765d07cbb9759699a4563", - "resolved-ref": "2b614414ce95d920880765d07cbb9759699a4563", - "url": "https://github.com/edde746/plus_plugins" + "ref": "bf04cdf66598dc3fca274b8b1db2b92b0bf6b73e", + "resolved-ref": "bf04cdf66598dc3fca274b8b1db2b92b0bf6b73e", + "url": "https://github.com/fluttercommunity/plus_plugins" }, "source": "git", - "version": "7.1.1" + "version": "7.2.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -390,11 +400,11 @@ "dependency": "direct dev", "description": { "name": "dart_code_linter", - "sha256": "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93", + "sha256": "44cce8527a2094201067b50aed97778930638cc43e8bb3cb0b40a90c36fb9c84", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.6" }, "dart_discord_presence": { "dependency": "direct main", @@ -873,13 +883,12 @@ "material_symbols_icons": { "dependency": "direct main", "description": { - "path": ".", - "ref": "1d8cd83", - "resolved-ref": "1d8cd8325db29691a01738a25f220dd3515bd1e2", - "url": "https://github.com/edde746/material_symbols_icons" + "name": "material_symbols_icons", + "sha256": "49c532dd0b74544e9d8d93ec0f821d52ec532e7c9263c889ebe71b1be4f34ba7", + "url": "https://pub.dev" }, - "source": "git", - "version": "4.2906.0" + "source": "hosted", + "version": "4.2951.0" }, "meta": { "dependency": "transitive", @@ -955,12 +964,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e", - "resolved-ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e", + "ref": "75556a968a4a1ebc42fbb8c31942c2418d4326e1", + "resolved-ref": "75556a968a4a1ebc42fbb8c31942c2418d4326e1", "url": "https://github.com/edde746/media_controls" }, "source": "git", - "version": "0.2.4" + "version": "0.3.0" }, "package_config": { "dependency": "transitive", @@ -1225,12 +1234,11 @@ "saf_util": { "dependency": "direct main", "description": { - "name": "saf_util", - "sha256": "0cf5fc462fc7e466e1d5608dd5a331d88d6dd6c7b01f62a305aaf469bf3309ea", - "url": "https://pub.dev" + "path": "packages/saf_util", + "relative": true }, - "source": "hosted", - "version": "2.0.0" + "source": "path", + "version": "3.1.0" }, "screen_retriever": { "dependency": "transitive", @@ -1286,11 +1294,11 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "288aee3d35f252ac0dc3a4b0accbbe7212fa2867604027f2cc5bc65334afd743", + "sha256": "09c573f98ff6c5e98d527f351f037eb8ea9ff684a6e9e84b2e91357144016254", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.16.0" + "version": "9.24.0" }, "sentry_dart_plugin": { "dependency": "direct dev", @@ -1306,11 +1314,11 @@ "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "f9e87d5895cc437902aa2b081727ee7e46524fe7cc2e1910f535480a3eeb8bed", + "sha256": "4a04b7e1901b8128df783b6d36d48706b07b0cd055e621517c998de87f5dafb9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.16.0" + "version": "9.24.0" }, "serial_csv": { "dependency": "transitive", @@ -1751,13 +1759,11 @@ "wakelock_plus": { "dependency": "direct main", "description": { - "path": "wakelock_plus", - "ref": "8595fee595c952b73d430f2eab05f2e0d858290e", - "resolved-ref": "8595fee595c952b73d430f2eab05f2e0d858290e", - "url": "https://github.com/edde746/wakelock_plus" + "path": "packages/wakelock_plus", + "relative": true }, - "source": "git", - "version": "1.4.0" + "source": "path", + "version": "1.5.2" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1833,11 +1839,11 @@ "dependency": "direct main", "description": { "name": "win_http", - "sha256": "a50a14f1bf32bc5c9b39add9baa01658b97146b21de25237810ca6b850a6704e", + "sha256": "ebc4d37e2c0e6800cc200e40d289d3bac22fc17d40fce3ae7909d49a20da77bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "window_manager": { "dependency": "direct main", @@ -1878,6 +1884,16 @@ }, "source": "hosted", "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" } }, "sdks": { diff --git a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch deleted file mode 100644 index f2ad98d1f153..000000000000 --- a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/pubspec.yaml -+++ b/pubspec.yaml -@@ -60,11 +60,7 @@ - git: - url: https://github.com/edde746/background_downloader - ref: b4d36f88bb365faaf308ff26be7ade49bbaec859 -- sentry_flutter: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/flutter -- ref: build/fetch-native-zip -+ sentry_flutter: 9.16.0 - auto_updater: - git: - url: https://github.com/edde746/auto_updater -@@ -110,16 +106,6 @@ - url: https://github.com/edde746/auto_updater - ref: 9e150f7 - path: packages/auto_updater_windows -- sentry: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/dart -- ref: build/fetch-native-zip -- sentry_flutter: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/flutter -- ref: build/fetch-native-zip - material_symbols_icons: - git: - url: https://github.com/edde746/material_symbols_icons diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh index 3791bc122fa0..6cba0df4c373 100755 --- a/pkgs/by-name/pl/plezy/update.sh +++ b/pkgs/by-name/pl/plezy/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter344 git +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go set -eou pipefail @@ -26,18 +26,8 @@ DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/ple DMG_SHA=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$DMG_URL")") sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix" -# Only here to handle the patched pubsec.yaml -workdir=$(mktemp -d) -trap 'rm -rf "$workdir"' EXIT - -curl --fail --silent --location "$GIT_SRC_URL" | tar -xz -C "$workdir" --strip-components=1 -patch -d "$workdir" -p1 < "$ROOT/replace-sentry-fork.patch" - -export PUB_CACHE="$workdir/.pub-cache" -flutter --no-version-check config --no-analytics >/dev/null -(cd "$workdir" && flutter --no-version-check pub get) - -yq eval --output-format=json --prettyPrint "$workdir/pubspec.lock" > "$ROOT/pubspec.lock.json" +curl --fail --silent --location "https://raw.githubusercontent.com/edde746/plezy/${latestVersion}/pubspec.lock" \ + | yq eval --output-format=json --prettyPrint > "$ROOT/pubspec.lock.json" python3 "$(dirname "$(readlink -f "$0")")/../../../development/compilers/dart/fetch-git-hashes.py" \ --input "$ROOT/pubspec.lock.json" \