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-conduit: 0.4.0 -> 0.5.0 #211309

Closed
wants to merge 2 commits into from
Closed

matrix-conduit: 0.4.0 -> 0.5.0 #211309

wants to merge 2 commits into from

Conversation

yu-re-ka
Copy link
Contributor

Description of changes

Involves some hacks

#202762
rust-lang/cargo#11192
ruma/ruma#1441

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

depsExtraArgs.postBuild = ''
sed 's/serde = { workspace = true/serde = { features = [ "derive" ], version = "*"/g' -i $name/ruma*/Cargo.toml
sed 's/tracing = { workspace = true.*/tracing = { version = "*" }/g' -i $name/ruma*/Cargo.toml
sed 's/workspace = true/version = "*"/g' -i $name/ruma*/Cargo.toml
Copy link
Member

Choose a reason for hiding this comment

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

Minor nitpick, but I'd do this which I think is easier to read:

    sed -i $name/ruma*/Cargo.toml \
      -e 's/serde = { workspace = true/serde = { features = [ "derive" ], version = "*"/g' \
      -e 's/tracing = { workspace = true.*/tracing = { version = "*" }/g' \
      -e 's/workspace = true/version = "*"/g'

Copy link
Member

Choose a reason for hiding this comment

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

That is of course assuming we cannot simply remove "workspace = true".

@peterhoeg
Copy link
Member

One more thing - we should also change the module as the service can now run with Type = "notify";

Comment on lines +19 to +21
-e 's/serde = { workspace = true/serde = { features = [ "derive" ], version = "*"/g' \
-e 's/tracing = { workspace = true.*/tracing = { version = "*" }/g' \
-e 's/workspace = true/version = "*"/g'
Copy link
Member

Choose a reason for hiding this comment

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

I would rather use a patch here to make the change more obvious and fail if some part does not apply with the next update.

Copy link
Member

Choose a reason for hiding this comment

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

That's a very good point. I'm with @SuperSandro2000 on this.

@yu-re-ka
Copy link
Contributor Author

I don't know how to do this, since it is not part of the source code of the application. Either way, someone else can finish this.

@yu-re-ka yu-re-ka closed this Jan 21, 2023
@CobaltCause CobaltCause mentioned this pull request Jan 22, 2023
13 tasks
@piegamesde
Copy link
Member

Continuation in #212036

@yu-re-ka yu-re-ka deleted the update-matrix-conduit branch February 1, 2023 20:58
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.

5 participants