From 3d758c9790c5b3ad93dcf3bc17142f0ff47d0b5c Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 6 Sep 2023 11:12:17 +0100
Subject: [PATCH 1/3] Update rustc in flake.nix to 1.71.1

To address CVE-2023-38497.
---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index b89b6d9218ee..dc7ab5b3fe4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,7 @@
                   #
                   # 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.70.0".default.override {
+                  (rust-bin.stable."1.71.1".default.override {
                     # Additionally install the "rust-src" extension to allow diving into the
                     # Rust source code in an IDE (rust-analyzer will also make use of it).
                     extensions = [ "rust-src" ];

From 696ca2e0e5adf121868c9a7fde5063218c9e7717 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 6 Sep 2023 11:27:46 +0100
Subject: [PATCH 2/3] Update oxalica/rust-overlay to
 a8b4bb4cbb744baaabc3e69099f352f99164e2c1

To get access to Rust v1.71.1.
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index d53be767a78a..9b360fa33eed 100644
--- a/flake.lock
+++ b/flake.lock
@@ -258,11 +258,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1690510705,
-        "narHash": "sha256-6mjs3Gl9/xrseFh9iNcNq1u5yJ/MIoAmjoaG7SXZDIE=",
+        "lastModified": 1693966243,
+        "narHash": "sha256-a2CA1aMIPE67JWSVIGoGtD3EGlFdK9+OlJQs0FOWCKY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "851ae4c128905a62834d53ce7704ebc1ba481bea",
+        "rev": "a8b4bb4cbb744baaabc3e69099f352f99164e2c1",
         "type": "github"
       },
       "original": {

From b7d2508577c1c62871769cdb70b538a08b2e1f1c Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 6 Sep 2023 11:30:55 +0100
Subject: [PATCH 3/3] Changelog

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

diff --git a/changelog.d/16260.misc b/changelog.d/16260.misc
new file mode 100644
index 000000000000..9f3289d7d4a5
--- /dev/null
+++ b/changelog.d/16260.misc
@@ -0,0 +1 @@
+Update rust to version 1.71.1 in the nix development environment.
\ No newline at end of file