From bf3eddaa729694d36085b7ebc537fbada4ce94c7 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 11 Aug 2025 16:20:04 +0200 Subject: [PATCH 1/3] plausible: move to by-name --- .../plausible/default.nix => by-name/pl/plausible/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/web-apps/plausible/default.nix => by-name/pl/plausible/package.nix} (100%) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/by-name/pl/plausible/package.nix similarity index 100% rename from pkgs/servers/web-apps/plausible/default.nix rename to pkgs/by-name/pl/plausible/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ac586e25d626..2508a0cd8ee33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1760,7 +1760,7 @@ with pkgs; lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; - plausible = callPackage ../servers/web-apps/plausible { + plausible = callPackage ../by-name/pl/plausible/package.nix { elixir = elixir_1_17; beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); }; From 58e620e91a956c33c91639ad13ab54998a7176cb Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 11 Aug 2025 16:22:50 +0200 Subject: [PATCH 2/3] plausible: refactor with lib use in meta --- pkgs/by-name/pl/plausible/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index 3b4a01bfabc32..e3a854e511966 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -174,13 +174,13 @@ beamPackages.mixRelease rec { mix do deps.loadpaths --no-deps-check, phx.digest priv/static ''; - meta = with lib; { - license = licenses.agpl3Plus; + meta = { + license = lib.licenses.agpl3Plus; homepage = "https://plausible.io/"; changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = "Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; mainProgram = "plausible"; - teams = [ teams.cyberus ]; - platforms = platforms.unix; + teams = with lib.teams; [ cyberus ]; + platforms = lib.platforms.unix; }; } From 23a50c47d3606aa7931f868a3f456c82c0bb4e0e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Wed, 16 Jul 2025 13:05:19 +0200 Subject: [PATCH 3/3] plausible: 2.1.5 -> 3.0.1 --- pkgs/by-name/pl/plausible/package.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index e3a854e511966..33ed6a68dd9b0 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -17,14 +17,14 @@ let pname = "plausible"; - version = "2.1.5"; + version = "3.0.1"; mixEnv = "ce"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - hash = "sha256-4gwK/AxzhsU0vgvKgIXrOyQLCgZMeZyKjj7PWbUmJ+8="; + hash = "sha256-DQIRsqkH2zgIkb3yezuJEKJ99PS031GJ+bDAeHMLNUY="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json sed -ie ' @@ -46,7 +46,7 @@ let pname = "${pname}-assets"; inherit version; src = "${src}/assets"; - npmDepsHash = "sha256-Rf1+G9F/CMK09KEh022vHe02FADJtARKX4QEVbmvSqk="; + npmDepsHash = "sha256-hPbKEC8DE/gb483COG/ZbTuEP8Y44Fs7ppHMpXphCjg="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -59,7 +59,7 @@ let pname = "${pname}-tracker"; inherit version; src = "${src}/tracker"; - npmDepsHash = "sha256-ng0YpBZc0vcg5Bsr1LmgXtzNCtNV6hJIgLt3m3yRdh4="; + npmDepsHash = "sha256-kfqJVUw3xnMT0sOkc5O42CwBxPQXiYnOQ5WpdZwzxfE"; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -75,7 +75,7 @@ let src mixEnv ; - hash = "sha256-edQ8byeV0WUaYDYMnmrstC6L2jztidR/JikGZLpX3WE="; + hash = "sha256-caCbuMEDsLcxm8xehWEJiaTfgl435crBfnQFQpzGsLY"; }; mjmlNif = rustPlatform.buildRustPackage { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2508a0cd8ee33..89618fec67173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1761,8 +1761,8 @@ with pkgs; lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; plausible = callPackage ../by-name/pl/plausible/package.nix { - elixir = elixir_1_17; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); + elixir = elixir_1_18; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_18; }); }; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };