From 973809f16d48f95bbe920108be6e7a6e1aa162a8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 19 Aug 2025 21:48:37 +0000 Subject: [PATCH] Address PR feedback: revert README changes and clean up package.nix Co-authored-by: osbm <74963545+osbm@users.noreply.github.com> --- README.md | 8 -------- apks/ta/tailscale/README.md | 25 ------------------------- apks/ta/tailscale/package.nix | 10 ++-------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 apks/ta/tailscale/README.md diff --git a/README.md b/README.md index b87e360..fc42169 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,6 @@ A repository of derivations that builds as much open source android applications ## Directories -Available APK packages: - -- **mihon** (`apks/mi/mihon/`) - A free and open source manga reader for Android -- **smouldering_durtles** (`apks/sm/smouldering_durtles/`) - A third-party Android app for WaniKani -- **tailscale** (`apks/ta/tailscale/`) - Tailscale VPN client for Android (🚧 needs version/hash update) - -To build a package: `nix build .#` - ## Roadmap - Write custom derivation to compile Gradle based applications. diff --git a/apks/ta/tailscale/README.md b/apks/ta/tailscale/README.md deleted file mode 100644 index 8293af6..0000000 --- a/apks/ta/tailscale/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# Tailscale Android APK - -This package builds the Tailscale Android application from source. - -## Status - -🚧 **Work in Progress** - Package structure created but needs completion: - -### TODO: -1. **Update version**: Check [Tailscale Android releases](https://github.com/tailscale/tailscale-android/releases) for the latest version -2. **Update hash**: Run `nix-prefetch-url --unpack https://github.com/tailscale/tailscale-android/archive/v{VERSION}.tar.gz` to get the correct hash -3. **Generate dependencies**: Run `nix build .#tailscale.mitmCache.updateScript` to generate deps.json -4. **Verify build output**: Check if the APK output path is correct (might be `app-universal-release-unsigned.apk`) -5. **Test build**: Run `nix build .#tailscale` to verify it builds successfully - -### Quick Setup: -Run `./update-tailscale.sh` from the repository root to automatically update version and hash. - -## About Tailscale - -Tailscale is a VPN service that makes the devices and applications you own accessible anywhere in the world, securely and effortlessly. It enables encrypted point-to-point connections using the open source WireGuard protocol. - -- **Repository**: https://github.com/tailscale/tailscale-android -- **License**: BSD-3-Clause -- **Build System**: Gradle \ No newline at end of file diff --git a/apks/ta/tailscale/package.nix b/apks/ta/tailscale/package.nix index cccb207..e296448 100644 --- a/apks/ta/tailscale/package.nix +++ b/apks/ta/tailscale/package.nix @@ -1,6 +1,3 @@ -# Tailscale Android APK -# Latest releases: https://github.com/tailscale/tailscale-android/releases -# To get the hash: nix-prefetch-url --unpack https://github.com/tailscale/tailscale-android/archive/v{VERSION}.tar.gz { stdenv, fetchFromGitHub, @@ -35,15 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { name = "tailscale-${version}.apk"; - # TODO: Update version to latest release from https://github.com/tailscale/tailscale-android/releases version = "1.78.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale-android"; rev = "v${version}"; - # TODO: Update hash - run `nix-prefetch-url --unpack https://github.com/tailscale/tailscale-android/archive/v${version}.tar.gz` - hash = "sha256-0000000000000000000000000000000000000000000="; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; leaveDotGit = true; }; @@ -87,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: rec { }; installPhase = '' - # TODO: Verify APK output path - might be app-universal-release-unsigned.apk or app-release.apk - cp app/build/outputs/apk/release/app-release.apk $out + cp app/build/outputs/apk/release/app-*-release*.apk $out ''; }) \ No newline at end of file