commit a471325eaf79bc615bf55155b7f708e903e643bd · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2311.section.md

···

       68
       68
        
       

     

       69
       69
        
       - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`.

     

       70
       70
        
       

     

       71
       71
       +
       - The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though:

     

       72
       72
       +
         - The option [`services.matrix-synapse.package`](#opt-services.matrix-synapse.package) is now read-only. For modifying the package, use an overlay which modifies `matrix-synapse-unwrapped` instead. More on that below.

     

       73
       73
       +
         - The `enableSystemd` & `enableRedis` arguments have been removed and `matrix-synapse` has been renamed to `matrix-synapse-unwrapped`. Also, several optional dependencies (such as `psycopg2` or `authlib`) have been removed.

     

       74
       74
       +
         - These optional dependencies are automatically added via a wrapper (`pkgs.matrix-synapse.override { extras = ["redis"]; }` for `hiredis` & `txredisapi` for instance) if the relevant config section is declared in `services.matrix-synapse.settings`. For instance, if `services.matrix-synapse.settings.redis.enabled` is set to `true`, `"redis"` will be automatically added to the `extras` list of `pkgs.matrix-synapse`.

     

       75
       75
       +
         - A list of all extras (and the extras enabled by default) can be found at the [option's reference for `services.matrix-synapse.extras`](#opt-services.matrix-synapse.extras).

     

       76
       76
       +
         - In some cases (e.g. for running synapse workers) it was necessary to re-use the `PYTHONPATH` of `matrix-synapse.service`'s environment to have all plugins available. This isn't necessary anymore, instead `config.services.matrix-synapse.package` can be used as it points to the wrapper with properly configured `extras` and also all plugins defined via [`services.matrix-synapse.plugins`](#opt-services.matrix-synapse.plugins) available. This is also the reason for why the option is read-only now, it's supposed to be set by the module only.

     

       77
       77
       +
       

     

       71
       78
        
       - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides

     

       72
       79
        
       

     

       73
       80
        
       - `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version.

+75 -12

nixos/modules/services/matrix/synapse.nix

···

       9
       9
        
         # remove null values from the final configuration

     

       10
       10
        
         finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings;

     

       11
       11
        
         configFile = format.generate "homeserver.yaml" finalSettings;

     

       12
       12
       -
         logConfigFile = format.generate "log_config.yaml" cfg.logConfig;

     

       13
       13
       -
       

     

       14
       14
       -
         pluginsEnv = cfg.package.python.buildEnv.override {

     

       15
       15
       -
           extraLibs = cfg.plugins;

     

       16
       16
       -
         };

     

       17
       12
        
       

     

       18
       13
        
         usePostgresql = cfg.settings.database.name == "psycopg2";

     

       19
       14
        
         hasLocalPostgresDB = let args = cfg.settings.database.args; in

     
···

       50
       45
        
                   "${bindAddress}"

     

       51
       46
        
               }:${builtins.toString listener.port}/"

     

       52
       47
        
           '';

     

       48
       48
       +
       

     

       49
       49
       +
         defaultExtras = [

     

       50
       50
       +
           "systemd"

     

       51
       51
       +
           "postgres"

     

       52
       52
       +
           "url-preview"

     

       53
       53
       +
           "user-search"

     

       54
       54
       +
         ];

     

       55
       55
       +
       

     

       56
       56
       +
         wantedExtras = cfg.extras

     

       57
       57
       +
           ++ lib.optional (cfg.settings ? oidc_providers) "oidc"

     

       58
       58
       +
           ++ lib.optional (cfg.settings ? jwt_config) "jwt"

     

       59
       59
       +
           ++ lib.optional (cfg.settings ? saml2_config) "saml2"

     

       60
       60
       +
           ++ lib.optional (cfg.settings ? opentracing) "opentracing"

     

       61
       61
       +
           ++ lib.optional (cfg.settings ? redis) "redis"

     

       62
       62
       +
           ++ lib.optional (cfg.settings ? sentry) "sentry"

     

       63
       63
       +
           ++ lib.optional (cfg.settings ? user_directory) "user-search"

     

       64
       64
       +
           ++ lib.optional (cfg.settings.url_preview_enabled) "url-preview"

     

       65
       65
       +
           ++ lib.optional (cfg.settings.database.name == "psycopg2") "postgres";

     

       66
       66
       +
       

     

       67
       67
       +
         wrapped = pkgs.matrix-synapse.override {

     

       68
       68
       +
           extras = wantedExtras;

     

       69
       69
       +
           inherit (cfg) plugins;

     

       70
       70
       +
         };

     

       53
       71
        
       in {

     

       54
       72
        
       

     

       55
       73
        
         imports = [

     
···

       151
       169
        
       

     

       152
       170
        
             package = mkOption {

     

       153
       171
        
               type = types.package;

     

       154
       154
       -
               default = pkgs.matrix-synapse;

     

       155
       155
       -
               defaultText = literalExpression "pkgs.matrix-synapse";

     

       172
       172
       +
               readOnly = true;

     

       173
       173
       +
               description = lib.mdDoc ''

     

       174
       174
       +
                 Reference to the `matrix-synapse` wrapper with all extras

     

       175
       175
       +
                 (e.g. for `oidc` or `saml2`) added to the `PYTHONPATH` of all executables.

     

       176
       176
       +
       

     

       177
       177
       +
                 This option is useful to reference the "final" `matrix-synapse` package that's

     

       178
       178
       +
                 actually used by `matrix-synapse.service`. For instance, when using

     

       179
       179
       +
                 workers, it's possible to run

     

       180
       180
       +
                 `''${config.services.matrix-synapse.package}/bin/synapse_worker` and

     

       181
       181
       +
                 no additional PYTHONPATH needs to be specified for extras or plugins configured

     

       182
       182
       +
                 via `services.matrix-synapse`.

     

       183
       183
       +
       

     

       184
       184
       +
                 However, this means that this option is supposed to be only declared

     

       185
       185
       +
                 by the `services.matrix-synapse` module itself and is thus read-only.

     

       186
       186
       +
                 In order to modify `matrix-synapse` itself, use an overlay to override

     

       187
       187
       +
                 `pkgs.matrix-synapse-unwrapped`.

     

       188
       188
       +
               '';

     

       189
       189
       +
             };

     

       190
       190
       +
       

     

       191
       191
       +
             extras = mkOption {

     

       192
       192
       +
               type = types.listOf (types.enum (lib.attrNames pkgs.matrix-synapse-unwrapped.optional-dependencies));

     

       193
       193
       +
               default = defaultExtras;

     

       194
       194
       +
               example = literalExpression ''

     

       195
       195
       +
                 [

     

       196
       196
       +
                   "cache-memory" # Provide statistics about caching memory consumption

     

       197
       197
       +
                   "jwt"          # JSON Web Token authentication

     

       198
       198
       +
                   "opentracing"  # End-to-end tracing support using Jaeger

     

       199
       199
       +
                   "oidc"         # OpenID Connect authentication

     

       200
       200
       +
                   "postgres"     # PostgreSQL database backend

     

       201
       201
       +
                   "redis"        # Redis support for the replication stream between worker processes

     

       202
       202
       +
                   "saml2"        # SAML2 authentication

     

       203
       203
       +
                   "sentry"       # Error tracking and performance metrics

     

       204
       204
       +
                   "systemd"      # Provide the JournalHandler used in the default log_config

     

       205
       205
       +
                   "url-preview"  # Support for oEmbed URL previews

     

       206
       206
       +
                   "user-search"  # Support internationalized domain names in user-search

     

       207
       207
       +
                 ]

     

       208
       208
       +
               '';

     

       156
       209
        
               description = lib.mdDoc ''

     

       157
       157
       -
                 Overridable attribute of the matrix synapse server package to use.

     

       210
       210
       +
                 Explicitly install extras provided by matrix-synapse. Most

     

       211
       211
       +
                 will require some additional configuration.

     

       212
       212
       +
       

     

       213
       213
       +
                 Extras will automatically be enabled, when the relevant

     

       214
       214
       +
                 configuration sections are present.

     

       215
       215
       +
       

     

       216
       216
       +
                 Please note that this option is additive: i.e. when adding a new item

     

       217
       217
       +
                 to this list, the defaults are still kept. To override the defaults as well,

     

       218
       218
       +
                 use `lib.mkForce`.

     

       158
       219
        
               '';

     

       159
       220
        
             };

     

       160
       221
        
       

     
···

       193
       254
        
               default = {};

     

       194
       255
        
               description = mdDoc ''

     

       195
       256
        
                 The primary synapse configuration. See the

     

       196
       196
       -
                 [sample configuration](https://github.com/matrix-org/synapse/blob/v${cfg.package.version}/docs/sample_config.yaml)

     

       257
       257
       +
                 [sample configuration](https://github.com/matrix-org/synapse/blob/v${pkgs.matrix-synapse-unwrapped.version}/docs/sample_config.yaml)

     

       197
       258
        
                 for possible values.

     

       198
       259
        
       

     

       199
       260
        
                 Secrets should be passed in by using the `extraConfigFiles` option.

     
···

       706
       767
        
           ];

     

       707
       768
        
       

     

       708
       769
        
           services.matrix-synapse.configFile = configFile;

     

       770
       770
       +
           services.matrix-synapse.package = wrapped;

     

       771
       771
       +
       

     

       772
       772
       +
           # default them, so they are additive

     

       773
       773
       +
           services.matrix-synapse.extras = defaultExtras;

     

       709
       774
        
       

     

       710
       775
        
           users.users.matrix-synapse = {

     

       711
       776
        
             group = "matrix-synapse";

     
···

       729
       794
        
                 --keys-directory ${cfg.dataDir} \

     

       730
       795
        
                 --generate-keys

     

       731
       796
        
             '';

     

       732
       732
       -
             environment = {

     

       733
       733
       -
               PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];

     

       734
       734
       -
             } // optionalAttrs (cfg.withJemalloc) {

     

       797
       797
       +
             environment = optionalAttrs (cfg.withJemalloc) {

     

       735
       798
        
               LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";

     

       736
       799
        
             };

     

       737
       800
        
             serviceConfig = {

+14 -1

nixos/tests/matrix/synapse.nix

···

       65
       65
        
       

     

       66
       66
        
         nodes = {

     

       67
       67
        
           # Since 0.33.0, matrix-synapse doesn't allow underscores in server names

     

       68
       68
       -
           serverpostgres = { pkgs, nodes, ... }: let

     

       68
       68
       +
           serverpostgres = { pkgs, nodes, config, ... }: let

     

       69
       69
        
             mailserverIP = nodes.mailserver.config.networking.primaryIPAddress;

     

       70
       70
        
           in

     

       71
       71
        
           {

     
···

       76
       76
        
                 database = {

     

       77
       77
        
                   name = "psycopg2";

     

       78
       78
        
                   args.password = "synapse";

     

       79
       79
       +
                 };

     

       80
       80
       +
                 redis = {

     

       81
       81
       +
                   enabled = true;

     

       82
       82
       +
                   host = "localhost";

     

       83
       83
       +
                   port = config.services.redis.servers.matrix-synapse.port;

     

       79
       84
        
                 };

     

       80
       85
        
                 tls_certificate_path = "${cert}";

     

       81
       86
        
                 tls_private_key_path = "${key}";

     
···

       105
       110
        
                   LC_COLLATE = "C"

     

       106
       111
        
                   LC_CTYPE = "C";

     

       107
       112
        
               '';

     

       113
       113
       +
             };

     

       114
       114
       +
       

     

       115
       115
       +
             services.redis.servers.matrix-synapse = {

     

       116
       116
       +
               enable = true;

     

       117
       117
       +
               port = 6380;

     

       108
       118
        
             };

     

       109
       119
        
       

     

       110
       120
        
             networking.extraHosts = ''

     
···

       207
       217
        
           serverpostgres.wait_for_unit("matrix-synapse.service")

     

       208
       218
        
           serverpostgres.wait_until_succeeds(

     

       209
       219
        
               "curl --fail -L --cacert ${ca_pem} https://localhost:8448/"

     

       220
       220
       +
           )

     

       221
       221
       +
           serverpostgres.wait_until_succeeds(

     

       222
       222
       +
               "journalctl -u matrix-synapse.service | grep -q 'Connected to redis'"

     

       210
       223
        
           )

     

       211
       224
        
           serverpostgres.require_unit_state("postgresql.service")

     

       212
       225
        
           serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/")

+69 -21

pkgs/servers/matrix-synapse/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, python3, openssl, cargo, rustPlatform, rustc

     

       2
       2
       -
       , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , python3

     

       5
       5
       +
       , openssl

     

       6
       6
       +
       , cargo

     

       7
       7
       +
       , rustPlatform

     

       8
       8
       +
       , rustc

     

       3
       9
        
       , nixosTests

     

       4
       4
       -
       , enableRedis ? true

     

       5
       10
        
       , callPackage

     

       6
       11
        
       }:

     

       7
       12
        
       

     
···

       9
       14
        
         plugins = python3.pkgs.callPackage ./plugins { };

     

       10
       15
        
         tools = callPackage ./tools { };

     

       11
       16
        
       in

     

       12
       12
       -
       with python3.pkgs;

     

       13
       13
       -
       buildPythonApplication rec {

     

       17
       17
       +
       python3.pkgs.buildPythonApplication rec {

     

       14
       18
        
         pname = "matrix-synapse";

     

       15
       19
        
         version = "1.89.0";

     

       16
       20
        
         format = "pyproject";

     
···

       34
       38
        
           sed -i '/^setuptools_rust =/d' pyproject.toml

     

       35
       39
        
         '';

     

       36
       40
        
       

     

       37
       37
       -
         nativeBuildInputs = [

     

       41
       41
       +
         nativeBuildInputs = with python3.pkgs; [

     

       38
       42
        
           poetry-core

     

       39
       43
        
           rustPlatform.cargoSetupHook

     

       40
       44
        
           setuptools-rust

     
···

       42
       46
        
           rustc

     

       43
       47
        
         ];

     

       44
       48
        
       

     

       45
       45
       -
         buildInputs = [ openssl ];

     

       49
       49
       +
         buildInputs = [

     

       50
       50
       +
           openssl

     

       51
       51
       +
         ];

     

       46
       52
        
       

     

       47
       47
       -
         propagatedBuildInputs = [

     

       48
       48
       -
           authlib

     

       53
       53
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       54
       54
       +
           attrs

     

       49
       55
        
           bcrypt

     

       50
       56
        
           bleach

     

       51
       57
        
           canonicaljson

     

       52
       52
       -
           daemonize

     

       58
       58
       +
           cryptography

     

       53
       59
        
           ijson

     

       54
       60
        
           immutabledict

     

       55
       61
        
           jinja2

     

       56
       62
        
           jsonschema

     

       57
       57
       -
           lxml

     

       58
       63
        
           matrix-common

     

       59
       64
        
           msgpack

     

       60
       65
        
           netaddr

     

       66
       66
       +
           packaging

     

       61
       67
        
           phonenumbers

     

       62
       68
        
           pillow

     

       63
       69
        
           prometheus-client

     

       64
       64
       -
           psutil

     

       65
       65
       -
           psycopg2

     

       66
       70
        
           pyasn1

     

       71
       71
       +
           pyasn1-modules

     

       67
       72
        
           pydantic

     

       68
       68
       -
           pyicu

     

       69
       73
        
           pymacaroons

     

       70
       70
       -
           pynacl

     

       71
       74
        
           pyopenssl

     

       72
       72
       -
           pysaml2

     

       73
       75
        
           pyyaml

     

       74
       74
       -
           requests

     

       75
       75
       -
           setuptools

     

       76
       76
       +
           service-identity

     

       76
       77
        
           signedjson

     

       77
       78
        
           sortedcontainers

     

       78
       79
        
           treq

     

       79
       80
        
           twisted

     

       80
       81
        
           typing-extensions

     

       81
       82
        
           unpaddedbase64

     

       82
       82
       -
         ] ++ lib.optional enableSystemd systemd

     

       83
       83
       -
           ++ lib.optionals enableRedis [ hiredis txredisapi ];

     

       83
       83
       +
         ]

     

       84
       84
       +
         ++ twisted.optional-dependencies.tls;

     

       84
       85
        
       

     

       85
       85
       -
         nativeCheckInputs = [ mock parameterized openssl ];

     

       86
       86
       +
         passthru.optional-dependencies = with python3.pkgs; {

     

       87
       87
       +
           postgres = if isPyPy then [

     

       88
       88
       +
             psycopg2cffi

     

       89
       89
       +
           ] else [

     

       90
       90
       +
             psycopg2

     

       91
       91
       +
           ];

     

       92
       92
       +
           saml2 = [

     

       93
       93
       +
             pysaml2

     

       94
       94
       +
           ];

     

       95
       95
       +
           oidc = [

     

       96
       96
       +
             authlib

     

       97
       97
       +
           ];

     

       98
       98
       +
           systemd = [

     

       99
       99
       +
             systemd

     

       100
       100
       +
           ];

     

       101
       101
       +
           url-preview = [

     

       102
       102
       +
             lxml

     

       103
       103
       +
           ];

     

       104
       104
       +
           sentry = [

     

       105
       105
       +
             sentry-sdk

     

       106
       106
       +
           ];

     

       107
       107
       +
           opentracing = [

     

       108
       108
       +
             jaeger-client

     

       109
       109
       +
             opentracing

     

       110
       110
       +
           ];

     

       111
       111
       +
           jwt = [

     

       112
       112
       +
             authlib

     

       113
       113
       +
           ];

     

       114
       114
       +
           redis = [

     

       115
       115
       +
             hiredis

     

       116
       116
       +
             txredisapi

     

       117
       117
       +
           ];

     

       118
       118
       +
           cache-memory = [

     

       119
       119
       +
             pympler

     

       120
       120
       +
           ];

     

       121
       121
       +
           user-search = [

     

       122
       122
       +
             pyicu

     

       123
       123
       +
           ];

     

       124
       124
       +
         };

     

       125
       125
       +
       

     

       126
       126
       +
         nativeCheckInputs = [

     

       127
       127
       +
           openssl

     

       128
       128
       +
         ] ++ (with python3.pkgs; [

     

       129
       129
       +
           mock

     

       130
       130
       +
           parameterized

     

       131
       131
       +
         ])

     

       132
       132
       +
         ++ lib.flatten (lib.attrValues passthru.optional-dependencies);

     

       86
       133
        
       

     

       87
       134
        
         doCheck = !stdenv.isDarwin;

     

       88
       135
        
       

     
···

       112
       159
        
       

     

       113
       160
        
         meta = with lib; {

     

       114
       161
        
           homepage = "https://matrix.org";

     

       162
       162
       +
           changelog = "https://github.com/matrix-org/synapse/releases/tag/v${version}";

     

       115
       163
        
           description = "Matrix reference homeserver";

     

       116
       164
        
           license = licenses.asl20;

     

       117
       165
        
           maintainers = teams.matrix.members;

+2 -2

pkgs/servers/matrix-synapse/plugins/ldap3.nix

···

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , ldap3

     

       6
       6
        
       , ldaptor

     

       7
       7
       -
       , matrix-synapse

     

       7
       7
       +
       , matrix-synapse-unwrapped

     

       8
       8
        
       , pytestCheckHook

     

       9
       9
        
       , service-identity

     

       10
       10
        
       , setuptools

     
···

       33
       33
        
       

     

       34
       34
        
         propagatedBuildInputs = [ service-identity ldap3 twisted ];

     

       35
       35
        
       

     

       36
       36
       -
         nativeCheckInputs = [ ldaptor matrix-synapse pytestCheckHook ];

     

       36
       36
       +
         nativeCheckInputs = [ ldaptor matrix-synapse-unwrapped pytestCheckHook ];

     

       37
       37
        
       

     

       38
       38
        
         pythonImportsCheck = [ "ldap_auth_provider" ];

     

       39
       39

+2 -2

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

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

     
···

       13
       13
        
       

     

       14
       14
        
         sourceRoot = "./${src.name}/synapse_antispam";

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ matrix-synapse ];

     

       16
       16
       +
         buildInputs = [ matrix-synapse-unwrapped ];

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false; # no tests

     

       19
       19
        
         pythonImportsCheck = [ "mjolnir" ];

+2 -2

pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "matrix-synapse-shared-secret-auth";

     
···

       14
       14
        
         doCheck = false;

     

       15
       15
        
         pythonImportsCheck = [ "shared_secret_authenticator" ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ matrix-synapse ];

     

       17
       17
       +
         buildInputs = [ matrix-synapse-unwrapped ];

     

       18
       18
        
         propagatedBuildInputs = [ twisted ];

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

+44

pkgs/servers/matrix-synapse/wrapper.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , makeWrapper

     

       4
       4
       +
       , matrix-synapse-unwrapped

     

       5
       5
       +
       , extras ? [

     

       6
       6
       +
           "postgres"

     

       7
       7
       +
           "url-preview"

     

       8
       8
       +
           "user-search"

     

       9
       9
       +
         ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd"

     

       10
       10
       +
       , plugins ? [ ]

     

       11
       11
       +
       , ...

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       let

     

       15
       15
       +
         extraPackages = lib.concatMap (extra: matrix-synapse-unwrapped.optional-dependencies.${extra}) (lib.unique extras);

     

       16
       16
       +
       

     

       17
       17
       +
         pluginsEnv = matrix-synapse-unwrapped.python.buildEnv.override {

     

       18
       18
       +
           extraLibs = plugins;

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         searchPath = lib.makeSearchPathOutput "lib" matrix-synapse-unwrapped.python.sitePackages (extraPackages ++ [ pluginsEnv ]);

     

       22
       22
       +
       in

     

       23
       23
       +
       stdenv.mkDerivation {

     

       24
       24
       +
         name = (lib.appendToName "wrapped" matrix-synapse-unwrapped).name;

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           makeWrapper

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildCommand = ''

     

       31
       31
       +
           for bin in ${matrix-synapse-unwrapped}/bin/*; do

     

       32
       32
       +
             echo $bin

     

       33
       33
       +
             makeWrapper "$bin" "$out/bin/$(basename $bin)" \

     

       34
       34
       +
               --set PYTHONPATH ${searchPath}

     

       35
       35
       +
           done;

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         passthru = {

     

       39
       39
       +
           unwrapped = matrix-synapse-unwrapped;

     

       40
       40
       +
       

     

       41
       41
       +
           # for backward compatibility

     

       42
       42
       +
           inherit (matrix-synapse-unwrapped) plugins tools;

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+4 -5

pkgs/top-level/all-packages.nix

···

       9839
       9839
        
       

     

       9840
       9840
        
         matrix-sliding-sync = callPackage ../servers/matrix-synapse/sliding-sync { };

     

       9841
       9841
        
       

     

       9842
       9842
       -
         matrix-synapse = callPackage ../servers/matrix-synapse { };

     

       9843
       9843
       -
       

     

       9844
       9844
       -
         matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins;

     

       9845
       9845
       -
       

     

       9846
       9846
       -
         matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools;

     

       9842
       9842
       +
         matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { };

     

       9843
       9843
       +
         matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { };

     

       9844
       9844
       +
         matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;

     

       9845
       9845
       +
         matrix-synapse-tools = recurseIntoAttrs matrix-synapse-unwrapped.tools;

     

       9847
       9846
        
       

     

       9848
       9847
        
         matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { };

     

       9849
       9848