diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2023-08-23 16:16:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 16:16:14 +0100 |
| commit | 85118420a226c5664f9cb8ea31d91cf842709740 (patch) | |
| tree | d87cc3e7ad3a6086857e9df645f2b7d10711f077 | |
| parent | Filter out unwanted user_agents from udv. (#16124) (diff) | |
| download | synapse-85118420a226c5664f9cb8ea31d91cf842709740.tar.xz | |
Switch `devenv` dependency in the nix development environment to the latest release (instead of the development branch) (#16063)
| -rw-r--r-- | changelog.d/16063.misc | 1 | ||||
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | flake.nix | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/changelog.d/16063.misc b/changelog.d/16063.misc new file mode 100644 index 0000000000..069fc1adab --- /dev/null +++ b/changelog.d/16063.misc @@ -0,0 +1 @@ +Fix building the nix development environment on MacOS systems. diff --git a/flake.lock b/flake.lock index 084c40fe2f..d53be767a7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,16 +8,16 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1690534632, - "narHash": "sha256-kOXS9x5y17VKliC7wZxyszAYrWdRl1JzggbQl0gyo94=", + "lastModified": 1688058187, + "narHash": "sha256-ipDcc7qrucpJ0+0eYNlwnE+ISTcq4m03qW+CWUshRXI=", "owner": "cachix", "repo": "devenv", - "rev": "6568e7e485a46bbf32051e4d6347fa1fed8b2f25", + "rev": "c8778e3dc30eb9043e218aaa3861d42d4992de77", "type": "github" }, "original": { "owner": "cachix", - "ref": "main", + "ref": "v0.6.3", "repo": "devenv", "type": "github" } diff --git a/flake.nix b/flake.nix index e70a41dfc2..b89b6d9218 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ # Output a development shell for x86_64/aarch64 Linux/Darwin (MacOS). systems.url = "github:nix-systems/default"; # A development environment manager built on Nix. See https://devenv.sh. - devenv.url = "github:cachix/devenv/main"; + devenv.url = "github:cachix/devenv/v0.6.3"; # Rust toolchain. rust-overlay.url = "github:oxalica/rust-overlay"; }; |