commit 22f3d4e4dbc415c880dabca13fcc11d45e8d53ab · pyrox.dev/nixpkgs

+7 -7

nixos/modules/module-list.nix

···

       515
       515
        
         ./services/mail/roundcube.nix

     

       516
       516
        
         ./services/mail/sympa.nix

     

       517
       517
        
         ./services/mail/nullmailer.nix

     

       518
       518
       -
         ./services/matrix/matrix-synapse.nix

     

       518
       518
       +
         ./services/matrix/appservice-discord.nix

     

       519
       519
       +
         ./services/matrix/appservice-irc.nix

     

       520
       520
       +
         ./services/matrix/conduit.nix

     

       521
       521
       +
         ./services/matrix/dendrite.nix

     

       522
       522
       +
         ./services/matrix/mautrix-facebook.nix

     

       523
       523
       +
         ./services/matrix/mautrix-telegram.nix

     

       519
       524
        
         ./services/matrix/mjolnir.nix

     

       520
       525
        
         ./services/matrix/pantalaimon.nix

     

       526
       526
       +
         ./services/matrix/synapse.nix

     

       521
       527
        
         ./services/misc/ananicy.nix

     

       522
       528
        
         ./services/misc/airsonic.nix

     

       523
       529
        
         ./services/misc/ankisyncd.nix

     
···

       536
       542
        
         ./services/misc/cpuminer-cryptonight.nix

     

       537
       543
        
         ./services/misc/cgminer.nix

     

       538
       544
        
         ./services/misc/confd.nix

     

       539
       539
       -
         ./services/misc/dendrite.nix

     

       540
       545
        
         ./services/misc/devmon.nix

     

       541
       546
        
         ./services/misc/dictd.nix

     

       542
       547
        
         ./services/misc/duckling.nix

     
···

       579
       584
        
         ./services/misc/libreddit.nix

     

       580
       585
        
         ./services/misc/lifecycled.nix

     

       581
       586
        
         ./services/misc/mame.nix

     

       582
       582
       -
         ./services/misc/matrix-appservice-discord.nix

     

       583
       583
       -
         ./services/misc/matrix-appservice-irc.nix

     

       584
       584
       -
         ./services/misc/matrix-conduit.nix

     

       585
       585
       -
         ./services/misc/mautrix-facebook.nix

     

       586
       586
       -
         ./services/misc/mautrix-telegram.nix

     

       587
       587
        
         ./services/misc/mbpfan.nix

     

       588
       588
        
         ./services/misc/mediatomb.nix

     

       589
       589
        
         ./services/misc/metabase.nix

nixos/modules/services/matrix/matrix-synapse-log_config.yaml nixos/modules/services/matrix/synapse-log_config.yaml

+2 -2

nixos/modules/services/matrix/matrix-synapse.nix nixos/modules/services/matrix/synapse.nix

···

       285
       285
        
       

     

       286
       286
        
                   log_config = mkOption {

     

       287
       287
        
                     type = types.path;

     

       288
       288
       -
                     default = ./matrix-synapse-log_config.yaml;

     

       288
       288
       +
                     default = ./synapse-log_config.yaml;

     

       289
       289
        
                     description = ''

     

       290
       290
        
                       The file that holds the logging configuration.

     

       291
       291
        
                     '';

     
···

       767
       767
        
       

     

       768
       768
        
         meta = {

     

       769
       769
        
           buildDocsInSandbox = false;

     

       770
       770
       -
           doc = ./matrix-synapse.xml;

     

       770
       770
       +
           doc = ./synapse.xml;

     

       771
       771
        
           maintainers = teams.matrix.members;

     

       772
       772
        
         };

     

       773
       773

nixos/modules/services/matrix/matrix-synapse.xml nixos/modules/services/matrix/synapse.xml

nixos/modules/services/misc/dendrite.nix nixos/modules/services/matrix/dendrite.nix

nixos/modules/services/misc/matrix-appservice-discord.nix nixos/modules/services/matrix/appservice-discord.nix

nixos/modules/services/misc/matrix-appservice-irc.nix nixos/modules/services/matrix/appservice-irc.nix

nixos/modules/services/misc/matrix-conduit.nix nixos/modules/services/matrix/conduit.nix

nixos/modules/services/misc/mautrix-facebook.nix nixos/modules/services/matrix/mautrix-facebook.nix

nixos/modules/services/misc/mautrix-telegram.nix nixos/modules/services/matrix/mautrix-telegram.nix

+4 -4

nixos/tests/all-tests.nix

···

       126
       126
        
         croc = handleTest ./croc.nix {};

     

       127
       127
        
         cryptpad = handleTest ./cryptpad.nix {};

     

       128
       128
        
         deluge = handleTest ./deluge.nix {};

     

       129
       129
       -
         dendrite = handleTest ./dendrite.nix {};

     

       129
       129
       +
         dendrite = handleTest ./matrix/dendrite.nix {};

     

       130
       130
        
         dex-oidc = handleTest ./dex-oidc.nix {};

     

       131
       131
        
         dhparams = handleTest ./dhparams.nix {};

     

       132
       132
        
         disable-installer-tools = handleTest ./disable-installer-tools.nix {};

     
···

       315
       315
        
         mariadb-galera = handleTest ./mysql/mariadb-galera.nix {};

     

       316
       316
        
         mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {};

     

       317
       317
        
         matomo = handleTest ./matomo.nix {};

     

       318
       318
       -
         matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {};

     

       319
       319
       -
         matrix-conduit = handleTest ./matrix-conduit.nix {};

     

       320
       320
       -
         matrix-synapse = handleTest ./matrix-synapse.nix {};

     

       318
       318
       +
         matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {};

     

       319
       319
       +
         matrix-conduit = handleTest ./matrix/conduit.nix {};

     

       320
       320
       +
         matrix-synapse = handleTest ./matrix/synapse.nix {};

     

       321
       321
        
         mattermost = handleTest ./mattermost.nix {};

     

       322
       322
        
         mediatomb = handleTest ./mediatomb.nix {};

     

       323
       323
        
         mediawiki = handleTest ./mediawiki.nix {};

+1 -1

nixos/tests/dendrite.nix nixos/tests/matrix/dendrite.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       1
       1
       +
       import ../make-test-python.nix (

     

       2
       2
        
         { pkgs, ... }:

     

       3
       3
        
           let

     

       4
       4
        
             homeserverUrl = "http://homeserver:8008";

+1 -1

nixos/tests/matrix-appservice-irc.nix nixos/tests/matrix/appservice-irc.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }:

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, ... }:

     

       2
       2
        
         let

     

       3
       3
        
           homeserverUrl = "http://homeserver:8008";

     

       4
       4
        
         in

+1 -1

nixos/tests/matrix-conduit.nix nixos/tests/matrix/conduit.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }:

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, ... }:

     

       2
       2
        
         let

     

       3
       3
        
           name = "conduit";

     

       4
       4
        
         in

+2 -2

nixos/tests/matrix-synapse.nix nixos/tests/matrix/synapse.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... } : let

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, ... } : let

     

       2
       2
        
       

     

       3
       3
        
       

     

       4
       4
        
         runWithOpenSSL = file: cmd: pkgs.runCommand file {

     
···

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
       

     

       30
       30
       -
         mailerCerts = import ./common/acme/server/snakeoil-certs.nix;

     

       30
       30
       +
         mailerCerts = import ../common/acme/server/snakeoil-certs.nix;

     

       31
       31
        
         mailerDomain = mailerCerts.domain;

     

       32
       32
        
         registrationSharedSecret = "unsecure123";

     

       33
       33
        
         testUser = "alice";