Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

matrix-synapse-unwrapped: 1.110.0 -> 1.111.0 #327806

Merged
merged 1 commit into from
Jul 20, 2024

Conversation

sumnerevans
Copy link
Contributor

Description of changes

https://github.com/element-hq/synapse/releases/tag/v1.111.0

This also reverts d2e41f1 as it is no longer necessary after element-hq/synapse#17353.

This also adds the python-multipart dependency that was added in element-hq/synapse#17365

Signed-off-by: Sumner Evans sumner.evans@automattic.com

Things done

Running on my homeserver (with workers) and it's working fine.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

This also reverts d2e41f1 as it is no
longer necessary after element-hq/synapse#17353.

This also adds the python-multipart dependency that was added in
element-hq/synapse#17365

Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
@Guanran928
Copy link
Contributor

Sorry for hijacking this, but how can I test this PR?

I've tried those options, but it apparently doesn't work.

nixpkgs-327806.url = "github:NixOS/nixpkgs/pull/327806/head";
services.matrix-synapse.package = inputs.nixpkgs-327806.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse;
[ERROR]   stderr)        error: The option `services.matrix-synapse.package' is read-only, but it's set multiple times. Definition values:
[ERROR]   stderr)        - In `/nix/store/94dnl1nka63a0d1kp99523qjcjl4wv9p-source/hosts/blacksteel': <derivation matrix-synapse-wrapped-1.111.0>
[ERROR]   stderr)        - In `/nix/store/77ijmdbv96rhqj2sr7aq0i5q8p16ii0d-source/nixos/modules/services/matrix/synapse.nix': <derivation matrix-synapse-wrapped-1.110.0>

@teutat3s
Copy link
Member

teutat3s commented Jul 18, 2024

@Guanran928 citing the option description from search.nixos.org:

However, this means that this option is supposed to be only declared by the services.matrix-synapse module itself and is thus read-only. In order to modify matrix-synapse itself, use an overlay to override pkgs.matrix-synapse-unwrapped.

Depending on your flake, this will need to be modified a bit:

overlays = [
  (final: prev: {
     matrix-synapse-unwrapped = inputs.nixpkgs-327806.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped;
   })
];

Copy link
Contributor

@Guanran928 Guanran928 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ma27
Copy link
Member

Ma27 commented Jul 19, 2024

Will test it today.

Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. Will merge tonight if it stays that way.

@Ma27 Ma27 merged commit bbf5759 into NixOS:master Jul 20, 2024
30 checks passed
Copy link
Contributor

Successfully created backport PR for release-24.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants