From 58c39aca1cffef0d112b410c4cd2f32a2e8ed19a Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 18 May 2025 14:00:30 +0200
Subject: [PATCH 1/2] follow: 0.3.7 -> 0.6.3
 https://github.com/RSSNext/Folo/releases/tag/v0.6.3

---
 pkgs/by-name/fo/follow/package.nix | 36 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix
index 4d8459936084..13d7f34ac630 100644
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@@ -6,32 +6,32 @@
   makeDesktopItem,
   makeWrapper,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   stdenv,
 }:
 stdenv.mkDerivation rec {
   pname = "follow";
 
-  version = "0.3.7";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "RSSNext";
-    repo = "Follow";
-    rev = "v${version}";
-    hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio=";
+    repo = "Folo";
+    tag = "v${version}";
+    hash = "sha256-huVk5KcsepDwtdWMm9pvn31GE1felbH1pR3mGqlSWRs=";
   };
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
     makeWrapper
     imagemagick
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit pname version src;
     fetcherVersion = 1;
-    hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM=";
+    hash = "sha256-6I10NSmTDd/wmL/HfAgLH+G2MDfuPmrTePNDDy08nRA=";
   };
 
   env = {
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
 
     # This environment variables inject the production Vite config at build time.
     # Copy from:
-    # 1. https://github.com/RSSNext/Follow/blob/v0.3.7/.github/workflows/build.yml#L18
-    # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml
+    # 1. https://github.com/RSSNext/Folo/blob/v0.4.6/.github/workflows/build-desktop.yml#L27
+    # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Folo/actions/workflows/build-desktop.yml
     VITE_WEB_URL = "https://app.follow.is";
     VITE_API_URL = "https://api.follow.is";
     VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008";
@@ -69,12 +69,18 @@ stdenv.mkDerivation rec {
     mimeTypes = [ "x-scheme-handler/follow" ];
   };
 
-  icon = src + "/resources/icon.png";
+  icon = src + "/apps/desktop/resources/icon.png";
 
   buildPhase = ''
     runHook preBuild
 
-    pnpm --offline electron-vite build
+    pnpm run build:packages
+
+    # Build desktop app.
+    cd apps/desktop
+    pnpm --offline --no-inline-css build:electron-vite
+    cd ../..
+
     # Remove dev dependencies.
     pnpm --ignore-scripts prune --prod
     # Clean up broken symlinks left behind by `pnpm prune`
@@ -92,8 +98,7 @@ stdenv.mkDerivation rec {
 
     makeWrapper "${electron}/bin/electron" "$out/bin/follow" \
       --inherit-argv0 \
-      --add-flags --disable-gpu-compositing \
-      --add-flags $out/share/follow \
+      --add-flags $out/share/follow/apps/desktop \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
     install -m 444 -D "${desktopItem}/share/applications/"* \
@@ -109,7 +114,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Next generation information browser";
-    homepage = "https://github.com/RSSNext/Follow";
+    homepage = "https://github.com/RSSNext/Folo";
+    changelog = "https://github.com/RSSNext/Folo/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ iosmanthus ];
     platforms = [ "x86_64-linux" ];

From 8316a47c2c5bdbd1be625dac71bd60f183b4d219 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 18 May 2025 14:05:03 +0200
Subject: [PATCH 2/2] folo: renamed from follow

---
 pkgs/by-name/fo/{follow => folo}/package.nix | 6 +++---
 pkgs/top-level/aliases.nix                   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/by-name/fo/{follow => folo}/package.nix (98%)

diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/folo/package.nix
similarity index 98%
rename from pkgs/by-name/fo/follow/package.nix
rename to pkgs/by-name/fo/folo/package.nix
index 13d7f34ac630..2503f7132bff 100644
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/folo/package.nix
@@ -10,7 +10,7 @@
   stdenv,
 }:
 stdenv.mkDerivation rec {
-  pname = "follow";
+  pname = "folo";
 
   version = "0.6.3";
 
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
   dontCheckForBrokenSymlinks = true;
 
   desktopItem = makeDesktopItem {
-    name = "follow";
-    desktopName = "Follow";
+    name = "folo";
+    desktopName = "Folo";
     comment = "Next generation information browser";
     icon = "follow";
     exec = "follow";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 95fa87207a0b..a4d3d280956b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -712,6 +712,7 @@ mapAliases {
   fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12
   fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21
   foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17
+  follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
   forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
   fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25
   foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28