Unverified Commit 1c698f52 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

matomo: refactor, matomo-beta: remove (#374022)

parents c068347f 7c2e8f1b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -291,6 +291,8 @@

- `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024.

- `matomo-beta` has been removed as the version of the `matomo` package can now be easily overriden through `overrideAttrs` (see [PR #374022](https://github.com/NixOS/nixpkgs/pull/374022))

- `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.

- `containerd` has been updated to v2, which contains breaking changes. See the [containerd
+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ in {
  mate = handleTest ./mate.nix {};
  mate-wayland = handleTest ./mate-wayland.nix {};
  matter-server = handleTest ./matter-server.nix {};
  matomo = handleTest ./matomo.nix {};
  matomo = runTest ./matomo.nix;
  matrix-appservice-irc = runTest ./matrix/appservice-irc.nix;
  matrix-conduit = handleTest ./matrix/conduit.nix {};
  matrix-synapse = handleTest ./matrix/synapse.nix {};
+45 −71
Original line number Diff line number Diff line
{ lib, ... }:
{
  system ? builtins.currentSystem,
  config ? { },
  pkgs ? import ../.. { inherit system config; },
}:

with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;

let
  matomoTest =
    package:
    makeTest {
  name = "matomo";

  nodes.machine =
    { config, pkgs, ... }:
    {
      services.matomo = {
            package = package;
        enable = true;
        nginx = {
          forceSSL = false;
@@ -57,13 +45,9 @@ let
      machine.sleep(1)
      machine.wait_for_unit("phpfpm-matomo.service")
  '';
    };
in
{
  matomo = matomoTest pkgs.matomo // {
    name = "matomo";

  meta.maintainers =
      with maintainers;
    with lib.maintainers;
    [
      florianjacob
      mmilata
@@ -71,14 +55,4 @@ in
      boozedog
    ]
    ++ lib.teams.flyingcircus.members;
  };
  matomo-beta = matomoTest pkgs.matomo-beta // {
    name = "matomo-beta";
    meta.maintainers = with maintainers; [
      florianjacob
      mmilata
      twey
      boozedog
    ];
  };
}
Loading