Modernise and fix the nix flake #19185

TheArcaneBrony · 2025-11-14T13:46:10Z

Summarised changes:

Update nix flake inputs
Updated devenv from 0.6.3 to 1.10
Bumped rust from 1.83 to 1.88 (needed to compile synapse)
Moved postgres to pg 17 (current nixpkgs stable default) at a non-default port (prevents conflicting when the dev machine already has postgres running)
Added a shorthand script in scripts-dev to run the tests with multithreading
Source the venv to stop poetry from wiping itself
Make cargo use git CLI for git modules (don't remember why this was needed)
Make sure pg_config is available if we need to build psychopg2 from source for some reason
Disabled diffs for flake.lock showing up by default via gitattributes (generated file)

Pull Request Checklist

Pull request is based on the develop branch
Pull request includes a changelog file. The entry should:
- Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
- Use markdown where necessary, mostly for code blocks.
- End with either a period (.) or an exclamation mark (!).
- Start with a capital letter.
- Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
Code style is correct (run the linters)

Signed-off-by: Rory& <[email protected]>

CLAassistant · 2025-11-14T13:46:16Z

All committers have signed the CLA.

Signed-off-by: Rory& <[email protected]>

TheArcaneBrony · 2025-11-15T06:53:51Z

Identified a missing piece: i'm unable to run the linter, not sure what all i'm missing or how to get that working, since the cargo thingy seems to throw a fit when i run lint.sh if i nix shell it

anoadragon453

Thanks for taking the time to do this! A few notes below.

flake.nix

anoadragon453 · 2025-11-17T12:19:14Z

flake.nix

                  # NOTE: We currently need to set the Rust version unnecessarily high
                  # in order to work around https://github.com/matrix-org/synapse/issues/15939
-                  (rust-bin.stable."1.82.0".default.override {
+                  (rust-bin.stable."1.88.0".default.override {


This should be at least 1.89, so that we can compile ruff: https://github.com/astral-sh/ruff/blob/1a86e1347200c1db319b9f9960799c1b192bb3fd/Cargo.toml#L8

Question: is there any risk in putting the version too high, or should it be kept at the minimum to ensure compatibility?

No risk. Typically the higher the better with Rust in the dev environment.

Might aswell bump it to 1.91.1 then, I suppose

anoadragon453 · 2025-11-17T12:19:56Z

flake.nix

+                # Workaround to make cargo fetch git repositories with the git CLI
+                env.CARGO_NET_GIT_FETCH_WITH_CLI = "true";


It'd be ideal to justify why this is needed, in case it has unintended side-effects.

anoadragon453 · 2025-11-17T12:20:15Z

flake.nix

+                  # Ensure the venv is activated explicitly, in order not to confuse poetry
+                  . .venv/bin/activate 


What do you mean by "confuse poetry"? What happens if this isn't here?

I'd been doing this manually for ages - if I skip that step, for some reason, any poetry command causes the .venv to get cleared, causing synapse to fail to start due to missing dependencies.
I could probably clarify that in the comment

That would be useful to do so, yeah.

anoadragon453 · 2025-11-17T12:20:30Z

flake.nix

                  debian-devscripts # (`dch` for manipulating the Debian changelog)
                  libnotify # (the release script uses `notify-send` to tell you when CI jobs are done)
+
+                  # For building psychopg2 from source, if needed


Suggested change

# For building psychopg2 from source, if needed

# For building psycopg2 from source, if needed

lol

anoadragon453 · 2025-11-17T12:21:37Z

.gitattributes

@@ -0,0 +1 @@
+flake.lock -diff


Suggested change

flake.lock -diff

# flake.lock is only meant to be read by machines.

flake.lock -diff

anoadragon453 · 2025-11-17T12:22:34Z

scripts-dev/test.sh

@@ -0,0 +1,2 @@
+#! /usr/bin/env sh
+poetry run trial -j`nproc` tests 


I'm not sure if such a short command really justifies a script?

I keep forgetting and having to hunt it down in the documentation, so it's just there as an aid.
Can be dropped if you want :)

yeahhh, this just doesn't quite sit right with me.

If you like, you could add a single-line script to the nix flake instead? https://devenv.sh/scripts/

TheArcaneBrony added 3 commits November 14, 2025 14:39

nix: update flake lock, disable diff by default for flake.lock

892ab8d

Signed-off-by: Rory& <[email protected]>

Update devenv from 0.6.3 to 1.10

fe0ce72

Signed-off-by: Rory& <[email protected]>

Add shortcut script to run tests

ead4715

Signed-off-by: Rory& <[email protected]>

TheArcaneBrony requested a review from a team as a code owner November 14, 2025 13:46

Add changelog

584701e

Signed-off-by: Rory& <[email protected]>

anoadragon453 requested changes Nov 17, 2025

View reviewed changes

anoadragon453 changed the title ~~Update devenv~~ Modernise and fix the nix flake Nov 19, 2025

		# Workaround to make cargo fetch git repositories with the git CLI
		env.CARGO_NET_GIT_FETCH_WITH_CLI = "true";

		# Ensure the venv is activated explicitly, in order not to confuse poetry
		. .venv/bin/activate

	# For building psychopg2 from source, if needed
	# For building psycopg2 from source, if needed

	flake.lock -diff
	# flake.lock is only meant to be read by machines.
	flake.lock -diff

		@@ -0,0 +1,2 @@
		#! /usr/bin/env sh
		poetry run trial -j`nproc` tests

Modernise and fix the nix flake #19185

Are you sure you want to change the base?

Modernise and fix the nix flake #19185

Conversation

TheArcaneBrony commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Checklist

Uh oh!

CLAassistant commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TheArcaneBrony commented Nov 15, 2025

Uh oh!

anoadragon453 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

TheArcaneBrony commented Nov 14, 2025 •

edited

Loading

CLAassistant commented Nov 14, 2025 •

edited

Loading