Skip to content

matrix-synapse,mautrix-facebook: fix runtime inclusion of python3 systemd#212391

Merged
K900 merged 1 commit intoNixOS:masterfrom
chvp:fix/matrix-synapse-systemd
Jan 24, 2023
Merged

matrix-synapse,mautrix-facebook: fix runtime inclusion of python3 systemd#212391
K900 merged 1 commit intoNixOS:masterfrom
chvp:fix/matrix-synapse-systemd

Conversation

@chvp
Copy link
Copy Markdown
Member

@chvp chvp commented Jan 24, 2023

Description of changes

#192197 broke these packages by adding systemd as a dependency. This meant that the included package was no longer the python3 systemd package, but the general systemd derivation. This broke the packages at runtime. This PR fixes that.

I also checked all other derivations touched by #192197, but these were the only were the systemd dependency was added erroneously.

Things done

Deployed this to my server and checked that it worked for matrix-synapse. I don't run mautrix-facebook, so I couldn't verify that.

  • 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.

…temd

NixOS#192197 broke these packages by adding
systemd as a dependency. This meant that the included package was no longer the
python3 systemd package, but the general systemd derivation. This broke the
packages at runtime. This PR fixes that.
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 24, 2023
@chvp
Copy link
Copy Markdown
Member Author

chvp commented Jan 24, 2023

@ofborg test matrix-synapse

@K900 K900 merged commit 9b49161 into NixOS:master Jan 24, 2023
@chvp chvp deleted the fix/matrix-synapse-systemd branch January 24, 2023 13:02
@SuperSandro2000
Copy link
Copy Markdown
Member

I am wondering myself why this easy to spot mistake was not caught in review.

@ghost
Copy link
Copy Markdown

ghost commented Jan 27, 2023

This was my fault, I screwed up. Thank you for cleaning up the mess.

I am wondering myself why this easy to spot mistake was not caught in review.

Because it's not easy to spot. The systemd there comes from a with python3.pkgs. Dynamic scoping (with) is fundamentally error prone. The with construct should be avoided when possible, and applied to small subexpressions (not entire derivations) elsewhere.

But crapping on reviewers here is not cool.

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

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants