diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/by-name/pl/plausible/package.nix similarity index 89% rename from pkgs/servers/web-apps/plausible/default.nix rename to pkgs/by-name/pl/plausible/package.nix index 3b4a01bfabc32..33ed6a68dd9b0 100644 --- a/pkgs/servers/web-apps/plausible/default.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 { @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ac586e25d626..89618fec67173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1760,9 +1760,9 @@ with pkgs; lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; - plausible = callPackage ../servers/web-apps/plausible { - elixir = elixir_1_17; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); + plausible = callPackage ../by-name/pl/plausible/package.nix { + 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 { };