diff --git a/Cargo.lock b/Cargo.lock
index dbff70b..d9ab36a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.70"
+version = "0.1.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80873f979f0a344a4ade87c2f70d9ccf5720b83b10c97ec7cd745895d021e85a"
+checksum = "d68bc55329711cd719c2687bb147bc06211b0521f97ef398280108ccb23227e9"
 
 [[package]]
 name = "core_io"
diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml
index aa06754..7a19266 100644
--- a/experiments/Cargo.toml
+++ b/experiments/Cargo.toml
@@ -3,7 +3,7 @@ name = "experiments"
 description = "Developing bare-metal Rust on Zynq"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706"]
diff --git a/flake.nix b/flake.nix
index 00ece56..1599a8b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import rust-overlay) crosspkgs-overlay ]; };
       
-      rust = pkgs.rust-bin.nightly."2022-04-01".default.override {
+      rust = pkgs.rust-bin.nightly."2024-06-07".default.override {
         extensions = [ "rust-src" ];
         targets = [ ];
       };
@@ -95,9 +95,7 @@
         dontFixup = true;
       };
 
-      cargo-xbuild = pkgs.cargo-xbuild.overrideAttrs(oa: {
-        postPatch = "substituteInPlace src/sysroot.rs --replace 2021 2018";
-      });
+      cargo-xbuild = pkgs.cargo-xbuild;
 
       build-crate = name: crate: features: rustPlatform.buildRustPackage rec {
         name = "${crate}";
@@ -113,7 +111,7 @@
           };
         };
 
-        nativeBuildInputs = [ cargo-xbuild pkgs.llvmPackages_14.clang-unwrapped ];
+        nativeBuildInputs = [ cargo-xbuild pkgs.llvmPackages_18.clang-unwrapped ];
         buildPhase = ''
           export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library"
           export CARGO_HOME=$(mktemp -d cargo-home.XXX)
@@ -169,7 +167,7 @@
 
           pkgs.openocd pkgs.gdb
           pkgs.openssh pkgs.rsync
-          pkgs.llvmPackages_14.clang-unwrapped
+          pkgs.llvmPackages_18.clang-unwrapped
           (pkgs.python3.withPackages(ps: [ ps.pyftdi ]))
         ];
       };
diff --git a/libasync/Cargo.toml b/libasync/Cargo.toml
index 9693d02..630b73f 100644
--- a/libasync/Cargo.toml
+++ b/libasync/Cargo.toml
@@ -3,7 +3,7 @@ name = "libasync"
 description = "low-level async support"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 #futures = { version = "0.3", default-features = false }
diff --git a/libboard_zynq/Cargo.toml b/libboard_zynq/Cargo.toml
index bae2d5d..49f3d52 100644
--- a/libboard_zynq/Cargo.toml
+++ b/libboard_zynq/Cargo.toml
@@ -3,7 +3,7 @@ name = "libboard_zynq"
 description = "Drivers for peripherals in the Zynq PS"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 target_zc706 = []
diff --git a/libconfig/Cargo.toml b/libconfig/Cargo.toml
index 3dd0456..ff514b2 100644
--- a/libconfig/Cargo.toml
+++ b/libconfig/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libconfig"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libboard_zynq = { path = "../libboard_zynq" }
diff --git a/libcortex_a9/Cargo.toml b/libcortex_a9/Cargo.toml
index 1553eb9..f5c1ade 100644
--- a/libcortex_a9/Cargo.toml
+++ b/libcortex_a9/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libcortex_a9"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 power_saving = []
diff --git a/libregister/Cargo.toml b/libregister/Cargo.toml
index 227e658..4fcda83 100644
--- a/libregister/Cargo.toml
+++ b/libregister/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libregister"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 vcell = "0.1"
diff --git a/libsupport_zynq/Cargo.toml b/libsupport_zynq/Cargo.toml
index f376b5f..884ca48 100644
--- a/libsupport_zynq/Cargo.toml
+++ b/libsupport_zynq/Cargo.toml
@@ -3,7 +3,7 @@ name = "libsupport_zynq"
 description = "Software support for running in the Zynq PS"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706"]
@@ -20,7 +20,7 @@ default = ["panic_handler", "dummy_irq_handler", "dummy_fiq_handler"]
 
 [dependencies]
 r0 = "1"
-compiler_builtins = "=0.1.70"
+compiler_builtins = "=0.1.108"
 linked_list_allocator = { version = "0.8", default-features = false, features = ["const_mut_refs"] }
 libregister = { path = "../libregister" }
 libcortex_a9 = { path = "../libcortex_a9" }
diff --git a/szl/Cargo.toml b/szl/Cargo.toml
index 351b071..4a80098 100644
--- a/szl/Cargo.toml
+++ b/szl/Cargo.toml
@@ -3,7 +3,7 @@ name = "szl"
 description = "Simple Zynq Loader"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706"]