diff options
Diffstat (limited to 'pkgs/servers/web-apps/plausible/default.nix')
-rw-r--r-- | pkgs/servers/web-apps/plausible/default.nix | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 40e7d878da29c..1e164f7394601 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -5,43 +5,35 @@ , glibcLocales , cacert , mkYarnModules +, fetchYarnDeps , nodejs -, fetchpatch , nixosTests }: let pname = "plausible"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - sha256 = "03lm1f29gwwixnhgjish5bhi3m73qyp71ns2sczdnwnbhrw61zps"; + sha256 = "sha256-mMQqjl3rNwjQGx8SN9PAkQErwiCs1HYSP4HWzevxYbQ="; }; # TODO consider using `mix2nix` as soon as it supports git dependencies. mixFodDeps = beamPackages.fetchMixDeps { pname = "${pname}-deps"; inherit src version; - sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi"; - - # We need ecto 3.6 as this version checks whether the database exists before - # trying to create it. The creation attempt would always require super-user privileges - # and since 3.6 this isn't the case anymore. - patches = [ - ./ecto_sql-fix.patch - ./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch - ]; + sha256 = "sha256-ZQfrTxsLzCWFf3vabOk0vyHWZLw69GJovm3vR+7UbMY="; }; yarnDeps = mkYarnModules { pname = "${pname}-yarn-deps"; inherit version; packageJSON = ./package.json; - yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; preBuild = '' mkdir -p tmp/deps cp -r ${mixFodDeps}/phoenix tmp/deps/phoenix @@ -57,19 +49,6 @@ beamPackages.mixRelease { nativeBuildInputs = [ nodejs ]; - patches = [ - # Allow socket-authentication against postgresql. Upstream PR is - # https://github.com/plausible/analytics/pull/1052 - (fetchpatch { - url = "https://github.com/Ma27/analytics/commit/f2ee5892a6c3e1a861d69ed30cac43e05e9cd36f.patch"; - sha256 = "sha256-JvJ7xlGw+tHtWje+jiQChVC4KTyqqdq2q+MIcOv/k1o="; - }) - - # Ensure that `tzdata` doesn't write into its store-path - # https://github.com/plausible/analytics/pull/1096, but rebased onto 1.3.0 - ./tzdata-rebased.patch - ]; - passthru = { tests = { inherit (nixosTests) plausible; }; updateScript = ./update.sh; |