diff --git a/Cargo.lock b/Cargo.lock index ee57881..2d7c6aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,9 +34,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "compiler_builtins" -version = "0.1.39" +version = "0.1.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3748f82c7d366a0b4950257d19db685d4958d2fa27c6d164a3f069fec42b748b" +checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2" [[package]] name = "core2" diff --git a/flake.lock b/flake.lock index e8df58a..52296a2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1721548954, - "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", + "lastModified": 1722221733, + "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "rev": "12bf09802d77264e441f48e25459c10c93eada2e", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1721701191, - "narHash": "sha256-nM4szL90VeZHZEC5rFfaiiPNTVOmsihdtk2QSP1l37I=", + "lastModified": 1722391647, + "narHash": "sha256-JTi7l1oxnatF1uX/gnGMlRnyFMtylRw4MqhCUdoN2K4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4674ff2c2e5423a0cebe16e61aa874c359306af4", + "rev": "0fd4a5d2098faa516a9b83022aec7db766cd1de8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dcc7542..d55fd39 100644 --- a/flake.nix +++ b/flake.nix @@ -128,7 +128,13 @@ src = builtins.filterSource (path: type: baseNameOf path != "target" ) ./.; - cargoLock = { lockFile = ./Cargo.lock; }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "fatfs-0.3.6" = "sha256-guMlE0AjG9W9Fm4gUGghE5F1JA7IkV35fZAbYn+nb98="; + }; + }; nativeBuildInputs = [ cargo-xbuild pkgs.llvmPackages_13.clang-unwrapped ]; buildPhase = '' @@ -141,10 +147,6 @@ popd ''; - outputHashes = { - "fatfs-0.3.6" = ""; - }; - installPhase = '' mkdir -p $out $out/nix-support cp target/armv7-none-eabihf/release/${name} $out/${name}.elf diff --git a/libsupport_zynq/Cargo.toml b/libsupport_zynq/Cargo.toml index 093b220..3b24959 100644 --- a/libsupport_zynq/Cargo.toml +++ b/libsupport_zynq/Cargo.toml @@ -19,7 +19,7 @@ default = ["panic_handler", "dummy_irq_handler", "dummy_fiq_handler"] [dependencies] r0 = "1" -compiler_builtins = "=0.1.39" +compiler_builtins = "=0.1.49" linked_list_allocator = { version = "0.8", default-features = false, features = ["const_mut_refs"] } libregister = { path = "../libregister" } libcortex_a9 = { path = "../libcortex_a9" }