From 8f510b5ca65f2b3be9cbc53bc8893731dce6818e Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Mon, 16 Dec 2024 14:31:29 +0800 Subject: [PATCH 01/11] change to C-unwind interface --- src/libunwind/lib.rs | 2 +- src/libunwind/libunwind.rs | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs index 34ae38d..8fa5db2 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs @@ -1,7 +1,7 @@ #![no_std] #![feature(link_cfg)] #![feature(nll)] -#![feature(unwind_attributes)] +#![feature(c_unwind)] #![feature(static_nobundle)] #![cfg_attr(not(target_env = "msvc"), feature(libc))] diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs index 0f0e457..4ec0626 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs @@ -77,8 +77,7 @@ pub type _Unwind_Exception_Cleanup_Fn = all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")), link(name = "unwind", kind = "static") )] -extern "C" { - #[unwind(allowed)] +extern "C-unwind" { pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; @@ -226,8 +225,7 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { #[cfg_attr(all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")), link(name = "unwind", kind = "static"))] - extern "C" { - #[unwind(allowed)] + extern "C-unwind" { pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, trace_argument: *mut c_void) @@ -238,8 +236,7 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { #[cfg_attr(all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")), link(name = "unwind", kind = "static"))] - extern "C" { - #[unwind(allowed)] + extern "C-unwind" { pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; } -- 2.47.0 From ffe302078872478d8f137fc16f2806b01147d9aa Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Mon, 16 Dec 2024 17:00:36 +0800 Subject: [PATCH 02/11] replace const_in_array_expression with inline --- src/libksupport/src/eh_artiq.rs | 12 ++++++------ src/libksupport/src/lib.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libksupport/src/eh_artiq.rs b/src/libksupport/src/eh_artiq.rs index 70b27a3..5b225e1 100644 --- a/src/libksupport/src/eh_artiq.rs +++ b/src/libksupport/src/eh_artiq.rs @@ -96,30 +96,30 @@ struct ExceptionBuffer { } static mut EXCEPTION_BUFFER: ExceptionBuffer = ExceptionBuffer { - uw_exceptions: [uw::_Unwind_Exception { + uw_exceptions: [const { uw::_Unwind_Exception { exception_class: EXCEPTION_CLASS, exception_cleanup: cleanup, private: [0; uw::unwinder_private_data_size], - }; MAX_INFLIGHT_EXCEPTIONS], + }}; MAX_INFLIGHT_EXCEPTIONS], exceptions: [None; MAX_INFLIGHT_EXCEPTIONS + 1], exception_stack: [-1; MAX_INFLIGHT_EXCEPTIONS + 1], backtrace: [(0, 0); MAX_BACKTRACE_SIZE], backtrace_size: 0, - stack_pointers: [StackPointerBacktrace { + stack_pointers: [const { StackPointerBacktrace { stack_pointer: 0, initial_backtrace_size: 0, current_backtrace_size: 0, - }; MAX_INFLIGHT_EXCEPTIONS + 1], + }}; MAX_INFLIGHT_EXCEPTIONS + 1], exception_count: 0, }; pub unsafe extern "C" fn reset_exception_buffer() { trace!("reset exception buffer"); - EXCEPTION_BUFFER.uw_exceptions = [uw::_Unwind_Exception { + EXCEPTION_BUFFER.uw_exceptions = [const { uw::_Unwind_Exception { exception_class: EXCEPTION_CLASS, exception_cleanup: cleanup, private: [0; uw::unwinder_private_data_size], - }; MAX_INFLIGHT_EXCEPTIONS]; + }}; MAX_INFLIGHT_EXCEPTIONS]; EXCEPTION_BUFFER.exceptions = [None; MAX_INFLIGHT_EXCEPTIONS + 1]; EXCEPTION_BUFFER.exception_stack = [-1; MAX_INFLIGHT_EXCEPTIONS + 1]; EXCEPTION_BUFFER.backtrace_size = 0; diff --git a/src/libksupport/src/lib.rs b/src/libksupport/src/lib.rs index 630f19e..4e303ee 100644 --- a/src/libksupport/src/lib.rs +++ b/src/libksupport/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] #![feature(c_variadic)] #![feature(const_btree_new)] -#![feature(const_in_array_repeat_expressions)] +#![feature(inline_const)] #![feature(naked_functions)] #![feature(asm)] -- 2.47.0 From 7d6d40a78580c70037249619d45a5d167092ca5b Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Mon, 16 Dec 2024 17:49:54 +0800 Subject: [PATCH 03/11] replace deprecated NoneError use --- src/satman/src/main.rs | 2 +- src/satman/src/subkernel.rs | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs index afff3fd..1d908e5 100644 --- a/src/satman/src/main.rs +++ b/src/satman/src/main.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(alloc_error_handler, try_trait, never_type, panic_info_message)] +#![feature(alloc_error_handler, never_type, panic_info_message)] #[macro_use] extern crate log; diff --git a/src/satman/src/subkernel.rs b/src/satman/src/subkernel.rs index a49e29a..a02fe7d 100644 --- a/src/satman/src/subkernel.rs +++ b/src/satman/src/subkernel.rs @@ -2,7 +2,7 @@ use alloc::{collections::BTreeMap, format, string::{String, ToString}, vec::Vec}; -use core::{option::NoneError, slice, str}; +use core::{slice, str}; use core_io::{Error as IoError, Write}; use cslice::AsCSlice; @@ -65,12 +65,6 @@ pub enum Error { DmaError(DmaError), } -impl From for Error { - fn from(_: NoneError) -> Error { - Error::KernelNotFound - } -} - impl From for Error { fn from(_value: IoError) -> Error { Error::SubkernelIoError @@ -316,7 +310,7 @@ impl<'a> Manager<'_> { complete: false, }, ); - self.kernels.get_mut(&id)? + self.kernels.get_mut(&id).ok_or_else(|| Error::KernelNotFound)? } else { kernel } @@ -329,7 +323,7 @@ impl<'a> Manager<'_> { complete: false, }, ); - self.kernels.get_mut(&id)? + self.kernels.get_mut(&id).ok_or_else(|| Error::KernelNotFound)? } }; kernel.library.extend(&data[0..data_len]); @@ -396,7 +390,7 @@ impl<'a> Manager<'_> { if self.session.id == id && self.session.kernel_state == KernelState::Loaded { return Ok(()); } - if !self.kernels.get(&id)?.complete { + if !self.kernels.get(&id).ok_or_else(|| Error::KernelNotFound)?.complete { return Err(Error::KernelNotFound); } self.session = Session::new(id); @@ -404,7 +398,7 @@ impl<'a> Manager<'_> { self.control .tx - .send(kernel::Message::LoadRequest(self.kernels.get(&id)?.library.clone())); + .send(kernel::Message::LoadRequest(self.kernels.get(&id).ok_or_else(|| Error::KernelNotFound)?.library.clone())); let reply = self.control.rx.recv(); match reply { kernel::Message::LoadCompleted => Ok(()), -- 2.47.0 From 81eba30a2934a8d676a87fc74f992b144876fc5a Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 11:46:36 +0800 Subject: [PATCH 04/11] prevent cursor r/w optimization --- src/libio/cursor.rs | 3 +++ src/libio/lib.rs | 1 + 2 files changed, 4 insertions(+) diff --git a/src/libio/cursor.rs b/src/libio/cursor.rs index bd397ac..46ff6d6 100644 --- a/src/libio/cursor.rs +++ b/src/libio/cursor.rs @@ -2,6 +2,7 @@ use alloc::vec::Vec; use core_io::{Error as IoError, Read, Write}; +use core::arch::asm; #[derive(Debug, Clone)] pub struct Cursor { @@ -47,6 +48,7 @@ impl> Read for Cursor { let len = buf.len().min(data.len()); // ``copy_from_slice`` generates AXI bursts, use a regular loop instead for i in 0..len { + unsafe { asm!("", options(preserves_flags, nostack, readonly)); } buf[i] = data[i]; } self.pos += len; @@ -59,6 +61,7 @@ impl Write for Cursor<&mut [u8]> { let data = &mut self.inner[self.pos..]; let len = buf.len().min(data.len()); for i in 0..len { + unsafe { asm!("", options(preserves_flags, nostack, readonly)); } data[i] = buf[i]; } self.pos += len; diff --git a/src/libio/lib.rs b/src/libio/lib.rs index 7abe5c1..70c2384 100644 --- a/src/libio/lib.rs +++ b/src/libio/lib.rs @@ -1,5 +1,6 @@ #![no_std] #![feature(never_type)] +#![feature(asm)] #[cfg(feature = "alloc")] extern crate alloc; -- 2.47.0 From 16801a35f45302d3819882f249b2807389eecca8 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 13:54:41 +0800 Subject: [PATCH 05/11] llvm11 -> llvm13 --- flake.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index e5421f3..0181666 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import zynq-rs.inputs.rust-overlay) ]; }; zynqpkgs = zynq-rs.packages.x86_64-linux; artiqpkgs = artiq.packages.x86_64-linux; - llvmPackages_11 = zynq-rs.llvmPackages_11; zynqRev = self.sourceInfo.rev or "unknown"; rust = zynq-rs.rust; @@ -134,13 +133,13 @@ pkgs.gnumake (pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ])) zynqpkgs.cargo-xbuild - llvmPackages_11.llvm - llvmPackages_11.clang-unwrapped + pkgs.llvmPackages_13.llvm + pkgs.llvmPackages_13.clang-unwrapped ]; buildPhase = '' export ZYNQ_REV=${zynqRev} export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library" - export CLANG_EXTRA_INCLUDE_DIR="${llvmPackages_11.clang-unwrapped.lib}/lib/clang/11.1.0/include" + export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_13.clang-unwrapped.lib}/lib/clang/13.0.1/include" export CARGO_HOME=$(mktemp -d cargo-home.XXX) export ZYNQ_RS=${zynq-rs} make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype} @@ -375,8 +374,8 @@ name = "artiq-zynq-dev-shell"; buildInputs = with pkgs; [ rust - llvmPackages_11.llvm - llvmPackages_11.clang-unwrapped + llvmPackages_13.llvm + llvmPackages_13.clang-unwrapped gnumake cacert zynqpkgs.cargo-xbuild @@ -391,7 +390,7 @@ ]; ZYNQ_REV="${zynqRev}"; XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library"; - CLANG_EXTRA_INCLUDE_DIR = "${llvmPackages_11.clang-unwrapped.lib}/lib/clang/11.1.0/include"; + CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_13.clang-unwrapped.lib}/lib/clang/13.0.1/include"; ZYNQ_RS = "${zynq-rs}"; OPENOCD_ZYNQ = "${zynq-rs}/openocd"; SZL = "${zynqpkgs.szl}"; -- 2.47.0 From 0021a01bdf55062aa26e0b608fb7757d6a8d072c Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 13:58:00 +0800 Subject: [PATCH 06/11] use forked core_io, up nalgebra --- src/libboard_artiq/Cargo.toml.tpl | 2 +- src/libio/Cargo.toml.tpl | 2 +- src/libksupport/Cargo.toml.tpl | 4 ++-- src/runtime/Cargo.toml.tpl | 4 ++-- src/satman/Cargo.toml.tpl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libboard_artiq/Cargo.toml.tpl b/src/libboard_artiq/Cargo.toml.tpl index ab8270f..c919bea 100644 --- a/src/libboard_artiq/Cargo.toml.tpl +++ b/src/libboard_artiq/Cargo.toml.tpl @@ -20,7 +20,7 @@ build_zynq = { path = "../libbuild_zynq" } log = "0.4" log_buffer = { version = "1.2" } crc = { version = "1.7", default-features = false } -core_io = { version = "0.1", features = ["collections"] } +core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] } embedded-hal = "0.2" nb = "1.0" void = { version = "1", default-features = false } diff --git a/src/libio/Cargo.toml.tpl b/src/libio/Cargo.toml.tpl index f6bd041..9c9baf8 100644 --- a/src/libio/Cargo.toml.tpl +++ b/src/libio/Cargo.toml.tpl @@ -8,7 +8,7 @@ name = "io" path = "lib.rs" [dependencies] -core_io = { version = "0.1", features = ["collections"] } +core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] } byteorder = { version = "1.0", default-features = false, optional = true } libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] } diff --git a/src/libksupport/Cargo.toml.tpl b/src/libksupport/Cargo.toml.tpl index 65f9e94..4cf01e6 100644 --- a/src/libksupport/Cargo.toml.tpl +++ b/src/libksupport/Cargo.toml.tpl @@ -12,7 +12,7 @@ build_zynq = { path = "../libbuild_zynq" } cslice = "0.3" log = "0.4" nb = "0.1" -core_io = { version = "0.1", features = ["collections"] } +core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] } byteorder = { version = "1.3", default-features = false } void = { version = "1", default-features = false } log_buffer = { version = "1.2" } @@ -35,6 +35,6 @@ libboard_artiq = { path = "../libboard_artiq" } [dependencies.nalgebra] git = "https://git.m-labs.hk/M-Labs/nalgebra.git" -rev = "dd00f9b" +rev = "ad42410ab0" default-features = false features = ["libm", "alloc"] diff --git a/src/runtime/Cargo.toml.tpl b/src/runtime/Cargo.toml.tpl index e57e63e..2630c6e 100644 --- a/src/runtime/Cargo.toml.tpl +++ b/src/runtime/Cargo.toml.tpl @@ -20,7 +20,7 @@ num-derive = "0.3" cslice = "0.3" log = "0.4" embedded-hal = "0.2" -core_io = { version = "0.1", features = ["collections"] } +core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] } crc = { version = "1.7", default-features = false } byteorder = { version = "1.3", default-features = false } void = { version = "1", default-features = false } @@ -46,4 +46,4 @@ libboard_artiq = { path = "../libboard_artiq" } [dependencies.tar-no-std] git = "https://git.m-labs.hk/M-Labs/tar-no-std" -rev = "2ab6dc5" \ No newline at end of file +rev = "2ab6dc5" diff --git a/src/satman/Cargo.toml.tpl b/src/satman/Cargo.toml.tpl index 38f64e6..f2be876 100644 --- a/src/satman/Cargo.toml.tpl +++ b/src/satman/Cargo.toml.tpl @@ -16,7 +16,7 @@ build_zynq = { path = "../libbuild_zynq" } [dependencies] log = { version = "0.4", default-features = false } byteorder = { version = "1.3", default-features = false } -core_io = { version = "0.1", features = ["collections"] } +core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] } crc = { version = "1.7", default-features = false } cslice = "0.3" embedded-hal = "0.2" -- 2.47.0 From 97e15d51f242c3918078af0f0d0af32da6aa1866 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 15:26:19 +0800 Subject: [PATCH 07/11] remove unused abi-blacklist, force-unwind-tables --- src/armv7-none-eabihf.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/armv7-none-eabihf.json b/src/armv7-none-eabihf.json index a677f3a..aa83f39 100644 --- a/src/armv7-none-eabihf.json +++ b/src/armv7-none-eabihf.json @@ -1,12 +1,4 @@ { - "abi-blacklist": [ - "stdcall", - "fastcall", - "vectorcall", - "thiscall", - "win64", - "sysv64" - ], "arch": "arm", "data-layout": "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "emit-debug-gdb-scripts": false, @@ -21,7 +13,6 @@ "os": "none", "panic-strategy": "abort", "requires-uwtable": true, - "force-unwind-tables": "yes", "relocation-model": "static", "target-c-int-width": "32", "target-endian": "little", -- 2.47.0 From 8d07f006f2bdbc1128776d1b6f2afb89b81f3941 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 15:28:12 +0800 Subject: [PATCH 08/11] silence inline_const warns --- src/libksupport/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libksupport/src/lib.rs b/src/libksupport/src/lib.rs index 4e303ee..1c216ca 100644 --- a/src/libksupport/src/lib.rs +++ b/src/libksupport/src/lib.rs @@ -1,4 +1,5 @@ #![no_std] +#![allow(incomplete_features)] #![feature(c_variadic)] #![feature(const_btree_new)] #![feature(inline_const)] -- 2.47.0 From 13264d999274d258d16db09ab403ce3e38f31dee Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 13:59:34 +0800 Subject: [PATCH 09/11] update cargo lockfile --- src/Cargo.lock | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index 1cd121c..7916c9f 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -58,9 +58,9 @@ version = "0.0.0" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "60f0b0d4c0a382d2734228fd12b5a6b5dac185c60e938026fd31b265b94f9bd2" [[package]] name = "cc" @@ -82,18 +82,14 @@ 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 = "core_io" -version = "0.1.20210325" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f8932064288cc79feb4d343a399d353a6f6f001e586ece47fe518a9e8507df" -dependencies = [ - "rustc_version", -] +version = "0.1.0" +source = "git+https://git.m-labs.hk/M-Labs/rs-core_io.git?rev=e9d3edf027#e9d3edf0272502b0dd6c26e8a4869c2912657615" [[package]] name = "crc" @@ -141,9 +137,8 @@ dependencies = [ [[package]] name = "fatfs" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e18f80a87439240dac45d927fd8f8081b6f1e34c03e97271189fa8a8c2e96c8f" +version = "0.3.6" +source = "git+https://git.m-labs.hk/M-Labs/rust-fatfs.git?rev=4b5e420084#4b5e420084fd1c4a9c105680b687523909b6469c" dependencies = [ "bitflags", "byteorder", @@ -373,9 +368,9 @@ checksum = "822add9edb1860698b79522510da17bef885171f75aa395cff099d770c609c24" [[package]] name = "log" -version = "0.4.17" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", ] @@ -395,7 +390,7 @@ checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577" [[package]] name = "nalgebra" version = "0.32.6" -source = "git+https://git.m-labs.hk/M-Labs/nalgebra.git?rev=dd00f9b#dd00f9b46046e0b931d1b470166db02fd29591be" +source = "git+https://git.m-labs.hk/M-Labs/nalgebra.git?rev=ad42410ab0#ad42410ab0abb014229e3ff6bc6ccd39ca92d5d1" dependencies = [ "approx", "num-complex", @@ -520,6 +515,7 @@ dependencies = [ "build_zynq", "byteorder", "core_io", + "crc", "cslice", "dwarf", "dyld", @@ -545,15 +541,6 @@ dependencies = [ "void", ] -[[package]] -name = "rustc_version" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" -dependencies = [ - "semver", -] - [[package]] name = "satman" version = "0.0.0" @@ -578,12 +565,6 @@ dependencies = [ "unwind", ] -[[package]] -name = "semver" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" - [[package]] name = "simba" version = "0.8.0" -- 2.47.0 From 7acf8af7f72db410f9a988e0333ccd845ec725b0 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 13:58:44 +0800 Subject: [PATCH 10/11] flake add outputHashes --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0181666..6437688 100644 --- a/flake.nix +++ b/flake.nix @@ -125,7 +125,9 @@ lockFile = src/Cargo.lock; outputHashes = { "tar-no-std-0.1.8" = "sha256-xm17108v4smXOqxdLvHl9CxTCJslmeogjm4Y87IXFuM="; - "nalgebra-0.32.6" = "sha256-L/YudkVOtfGYoNQKBD7LMk/sMYgRDzPDdpGL5rO7G2I="; + "nalgebra-0.32.6" = "sha256-ZbQQZbM3A5cJ4QbujtUxkrI0/qGlI4UzfahtyQnvMZA="; + "core_io-0.1.0" = "sha256-0HINFWRiJx8pjMgUOL/CS336ih7SENSRh3Kah9LPRrw="; + "fatfs-0.3.6" = "sha256-Nz9hCq/1YgSXF8ltJ5ZawV0Hc8WV44KNK0tJdVnNb4U="; }; }; -- 2.47.0 From 8fd8cae9d54a761fa2932ac55ff381da9ad78b1a Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Tue, 17 Dec 2024 13:59:57 +0800 Subject: [PATCH 11/11] update dependencies --- flake.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index a477afd..a6f88b7 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "src-pythonparser": "src-pythonparser" }, "locked": { - "lastModified": 1733894986, - "narHash": "sha256-zwMs87eUiVURXqavNYL42ZGi+INA7AXHUkx+go9dCLs=", + "lastModified": 1734418848, + "narHash": "sha256-FiK84edtdmpJ3FUA58XAUmDDp4oVPgupmf1CcgJ6rC0=", "ref": "refs/heads/master", - "rev": "3db8d2310cb45989a7fb4408508013ea1c03f7b9", - "revCount": 9113, + "rev": "366bb0fc59dbe4d5f544908b0f3e31f8eb19f7c1", + "revCount": 9121, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1733319649, - "narHash": "sha256-ATJV2UV9FXEiTF6/1BvZ2HmB0goF5TZ2ytgRBwD/BGg=", + "lastModified": 1734267097, + "narHash": "sha256-aWg7XDiOlWnkXfDbKrBn9ITR46/JXfndvYHxFJ1vN78=", "owner": "m-labs", "repo": "sipyco", - "rev": "27312727bdb8a182bd6e222e4cbdd3f39ae41d4e", + "rev": "430978ada3fefe32de01f1b884b3031e48aaef96", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1731749494, - "narHash": "sha256-WGigAhvVCGN5YZ1dHPyvoqAh47W1Gtph036O1aKFlLE=", + "lastModified": 1734668221, + "narHash": "sha256-X0U2yPmlsD3VLBZQyfWv8qw04Qn0qFWIONJUPPigB0U=", "ref": "refs/heads/master", - "rev": "12975de2e110d7948bf47b768559f727d0abc8fc", - "revCount": 655, + "rev": "213529cf7a50aa1b2d9ffdf575e3e38202ff9bd6", + "revCount": 666, "type": "git", "url": "https://git.m-labs.hk/m-labs/zynq-rs" }, -- 2.47.0