commit ff9aa77c1fa46974eebfa7aa3afe5d389d444abe · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/matrix/mjolnir.xml

···

       98
       98
        
         </para>

     

       99
       99
        
         <para>

     

       100
       100
        
          To use the Antispam Module, add <package>matrix-synapse-plugins.matrix-synapse-mjolnir-antispam</package>

     

       101
       101
       -
          to the Synapse plugin list and enable the <literal>mjolnir.AntiSpam</literal> module.

     

       101
       101
       +
          to the Synapse plugin list and enable the <literal>mjolnir.Module</literal> module.

     

       102
       102
        
         </para>

     

       103
       103
        
       <programlisting>

     

       104
       104
        
       {

     
···

       108
       108
        
           ];

     

       109
       109
        
           extraConfig = ''

     

       110
       110
        
             modules:

     

       111
       111
       -
               - module: mjolnir.AntiSpam

     

       111
       111
       +
               - module: mjolnir.Module

     

       112
       112
        
                 config:

     

       113
       113
        
                   # Prevent servers/users in the ban lists from inviting users on this

     

       114
       114
        
                   # server to rooms. Default true.

+28 -3

pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "matrix-synapse-mjolnir-antispam";

     

       5
       5
       -
         version = "1.2.1";

     

       5
       5
       +
         version = "1.3.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "matrix-org";

     

       9
       9
        
           repo = "mjolnir";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "0fvdzn5l1a6bhr1qzgs30a3kh6nj0byqichnl149sjgr0v4lpkz1";

     

       11
       11
       +
           sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";

     

       12
       12
        
         };

     

       13
       13
       +
       

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           #  Update legacy antispam plugin with newer types. Or it'll just ignore mjolnir 1.3.1 rules.

     

       16
       16
       +
           (fetchpatch {

     

       17
       17
       +
             url = "https://github.com/matrix-org/mjolnir/commit/eb8c5e08b4c2b78e6a796e38e826ac3b7e9dfbaf.patch";

     

       18
       18
       +
             sha256 = "sha256-rfFU45PfxR2YmNRU74eBI9M2hqBVZcNH0Sw8W/cavD4=";

     

       19
       19
       +
             stripLen = 1;

     

       20
       20
       +
           })

     

       21
       21
       +
           # Port to Synapse module API (needs Synapse >= 1.37.0)

     

       22
       22
       +
           (fetchpatch {

     

       23
       23
       +
             url = "https://github.com/matrix-org/mjolnir/commit/9c9bd0e02907412b5fa6b95844e9f53ac07b61fd.patch";

     

       24
       24
       +
             sha256 = "sha256-HR2OvqFnlQwRV7ezfOjseatjo+3P8i9PsV7D+hLD1Yo=";

     

       25
       25
       +
             stripLen = 1;

     

       26
       26
       +
             excludes = [

     

       27
       27
       +
               "README.md"

     

       28
       28
       +
               "mx-tester.yml"

     

       29
       29
       +
             ];

     

       30
       30
       +
           })

     

       31
       31
       +
           # Move glob_to_regex into the source

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             url = "https://github.com/matrix-org/mjolnir/commit/6cb461fed424f07bf50a1fdc0693d40ed8bbee12.patch";

     

       34
       34
       +
             sha256 = "sha256-tqcKXNs+fxwPIvN5sJjdNgcz5KUVHiXgulLHR2redYk=";

     

       35
       35
       +
             stripLen = 1;

     

       36
       36
       +
           })

     

       37
       37
       +
         ];

     

       13
       38
        
       

     

       14
       39
        
         sourceRoot = "./source/synapse_antispam";

     

       15
       40