follow: 0.3.7 -> 0.6.3, folo: renamed from follow (#408358)

authored by

Peder Bergebakken Sundt and committed by
GitHub
c9057809 c46958ec

+25 -18
+24 -18
pkgs/by-name/fo/follow/package.nix pkgs/by-name/fo/folo/package.nix
··· 6 6 makeDesktopItem, 7 7 makeWrapper, 8 8 nodejs, 9 - pnpm_9, 9 + pnpm_10, 10 10 stdenv, 11 11 }: 12 12 stdenv.mkDerivation rec { 13 - pname = "follow"; 13 + pname = "folo"; 14 14 15 - version = "0.3.7"; 15 + version = "0.6.3"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "RSSNext"; 19 - repo = "Follow"; 20 - rev = "v${version}"; 21 - hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio="; 19 + repo = "Folo"; 20 + tag = "v${version}"; 21 + hash = "sha256-huVk5KcsepDwtdWMm9pvn31GE1felbH1pR3mGqlSWRs="; 22 22 }; 23 23 24 24 nativeBuildInputs = [ 25 25 nodejs 26 - pnpm_9.configHook 26 + pnpm_10.configHook 27 27 makeWrapper 28 28 imagemagick 29 29 ]; 30 30 31 - pnpmDeps = pnpm_9.fetchDeps { 31 + pnpmDeps = pnpm_10.fetchDeps { 32 32 inherit pname version src; 33 33 fetcherVersion = 1; 34 - hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM="; 34 + hash = "sha256-6I10NSmTDd/wmL/HfAgLH+G2MDfuPmrTePNDDy08nRA="; 35 35 }; 36 36 37 37 env = { ··· 39 39 40 40 # This environment variables inject the production Vite config at build time. 41 41 # Copy from: 42 - # 1. https://github.com/RSSNext/Follow/blob/v0.3.7/.github/workflows/build.yml#L18 43 - # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml 42 + # 1. https://github.com/RSSNext/Folo/blob/v0.4.6/.github/workflows/build-desktop.yml#L27 43 + # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Folo/actions/workflows/build-desktop.yml 44 44 VITE_WEB_URL = "https://app.follow.is"; 45 45 VITE_API_URL = "https://api.follow.is"; 46 46 VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008"; ··· 60 60 dontCheckForBrokenSymlinks = true; 61 61 62 62 desktopItem = makeDesktopItem { 63 - name = "follow"; 64 - desktopName = "Follow"; 63 + name = "folo"; 64 + desktopName = "Folo"; 65 65 comment = "Next generation information browser"; 66 66 icon = "follow"; 67 67 exec = "follow"; ··· 69 69 mimeTypes = [ "x-scheme-handler/follow" ]; 70 70 }; 71 71 72 - icon = src + "/resources/icon.png"; 72 + icon = src + "/apps/desktop/resources/icon.png"; 73 73 74 74 buildPhase = '' 75 75 runHook preBuild 76 76 77 - pnpm --offline electron-vite build 77 + pnpm run build:packages 78 + 79 + # Build desktop app. 80 + cd apps/desktop 81 + pnpm --offline --no-inline-css build:electron-vite 82 + cd ../.. 83 + 78 84 # Remove dev dependencies. 79 85 pnpm --ignore-scripts prune --prod 80 86 # Clean up broken symlinks left behind by `pnpm prune` ··· 92 98 93 99 makeWrapper "${electron}/bin/electron" "$out/bin/follow" \ 94 100 --inherit-argv0 \ 95 - --add-flags --disable-gpu-compositing \ 96 - --add-flags $out/share/follow \ 101 + --add-flags $out/share/follow/apps/desktop \ 97 102 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" 98 103 99 104 install -m 444 -D "${desktopItem}/share/applications/"* \ ··· 109 114 110 115 meta = { 111 116 description = "Next generation information browser"; 112 - homepage = "https://github.com/RSSNext/Follow"; 117 + homepage = "https://github.com/RSSNext/Folo"; 118 + changelog = "https://github.com/RSSNext/Folo/releases/tag/${src.tag}"; 113 119 license = lib.licenses.gpl3Only; 114 120 maintainers = with lib.maintainers; [ iosmanthus ]; 115 121 platforms = [ "x86_64-linux" ];
+1
pkgs/top-level/aliases.nix
··· 712 712 fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12 713 713 fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21 714 714 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 715 + follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18 715 716 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 716 717 fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25 717 718 foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28