From ce5005a1df9add94a58c67ca4a40f85c26b07383 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 4 Aug 2023 13:41:54 +0100
Subject: [PATCH 1/2] Switch devenv from development branch to v0.6.3

Broke in https://github.com/matrix-org/synapse/pull/16019. This would have been caught
if someone ran 'devenv up' during manual testing of that PR, or better yet, if we had
CI for the nix developer environment.

Switch back to the latest release version, which doesn't have the upstream issue:
https://github.com/cachix/devenv/issues/756
---
 flake.lock | 8 ++++----
 flake.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 084c40fe2f8a..d53be767a78a 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 e70a41dfc2fa..b89b6d9218ee 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";
   };

From 3ce99e119051cba4d9292e3b01dab897f531c569 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 4 Aug 2023 13:45:30 +0100
Subject: [PATCH 2/2] changelog

---
 changelog.d/16063.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/16063.misc

diff --git a/changelog.d/16063.misc b/changelog.d/16063.misc
new file mode 100644
index 000000000000..069fc1adaba0
--- /dev/null
+++ b/changelog.d/16063.misc
@@ -0,0 +1 @@
+Fix building the nix development environment on MacOS systems.