Unverified Commit 373faab6 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

mobilizon: 5.1.1 -> 5.1.2, restart service on failure (#383362)

parents 6cd88104 f01af3a8

nixos/modules/services/web-apps/mobilizon.nix

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ in 
      serviceConfig = {

        Type = "oneshot";

        User = config.services.postgresql.superUser;

        Restart = "on-failure";

      };

    };

pkgs/servers/mobilizon/0001-fix-version.patch

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ index 8338abf8..883e6987 100644 
   use Mix.Project

 

-  @version "5.1.0"

+  @version "5.1.1"

+  @version "5.1.2"

 

   def project do

     [

pkgs/servers/mobilizon/common.nix

+5 −4
Original line number Diff line number Diff line 
{ fetchFromGitLab }: rec {

{ fetchFromGitLab }:

rec {



  pname = "mobilizon";

  version = "5.1.1";

  version = "5.1.2";



  src = fetchFromGitLab {

    domain = "framagit.org";

    owner = "framasoft";

    repo = pname;

    rev = version;

    sha256 = "sha256-zH/F+8rqzlMh0itVBOgDDzAx6n1nJH81lMzaBfjzhXU=";

    tag = version;

    sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM=";

  };

}

pkgs/servers/mobilizon/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
  git,

  cmake,

  nixosTests,

  nixfmt-rfc-style,

  mobilizon-frontend,

  ...

}:
@@ -20,9 +21,8 @@ mixRelease rec { 
  inherit (common) pname version src;



  patches = [

    # Version 5.1.1 failed to bump their internal package version,

    # Version 5.1.2 failed to bump their internal package version,

    # which causes issues with static file serving in the NixOS module.

    # See https://github.com/NixOS/nixpkgs/pull/370277

    ./0001-fix-version.patch

    # Mobilizon uses chunked Transfer-Encoding for the media proxy but also

    # sets the Content-Length header. This is a HTTP/1.1 protocol violation
@@ -153,11 +153,12 @@ mixRelease rec { 
  '';



  passthru = {

    tests.smoke-test = nixosTests.mobilizon;

    tests = { inherit (nixosTests) mobilizon; };

    updateScript = writeShellScriptBin "update.sh" ''

      set -eou pipefail



      ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix

      ${nixfmt-rfc-style}/bin/nixfmt pkgs/servers/mobilizon/mix.nix

    '';

    elixirPackage = beamPackages.elixir;

  };
@@ -165,6 +166,7 @@ mixRelease rec { 
  meta = with lib; {

    description = "Mobilizon is an online tool to help manage your events, your profiles and your groups";

    homepage = "https://joinmobilizon.org/";

    changelog = "https://framagit.org/framasoft/mobilizon/-/releases/${src.tag}";

    license = licenses.agpl3Plus;

    maintainers = with maintainers; [

      minijackson