From 85118420a226c5664f9cb8ea31d91cf842709740 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:16:14 +0100
Subject: [PATCH] Switch `devenv` dependency in the nix development environment
 to the latest release (instead of the development branch) (#16063)

---
 changelog.d/16063.misc | 1 +
 flake.lock             | 8 ++++----
 flake.nix              | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/16063.misc

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";
   };