M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity
9,261 Commits 13 Branches 35 Tags 26 MiB
Commit Graph

196 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq f6800bdba2 Merge branch 'master' into nac3 2024-07-27 23:33:01 +08:00
Sebastien Bourdeauducq 2d7bdce3b8 Revert "flake: update pyqt5" 
This reverts commit 846d0f9249.
 2024-07-27 22:21:14 +08:00
Sebastien Bourdeauducq b588295063 flake: switch to nixpkgs unstable (py3.12), update nix deps 2024-07-27 21:49:33 +08:00
mwojcik d6bcc64518 flake: update qasync to support pyqt6 2024-07-27 21:37:19 +08:00
David Nadlinger 9fbd6de30c Qt{5 -> 6} 
Some changes are due to deprecations in Qt6 which were outright
removed in PyQt, for instance QRegExp or the x()/y() QMouseEvent
properties. Most of the diff is due to enumeration values now no
longer being available directly in the parent namespace.

This commit is purposefully restricted to the mechanical changes,
no reformatting/… is done to keep the diff easy to validate.
 2024-07-27 21:37:19 +08:00
Sebastien Bourdeauducq 846d0f9249 flake: update pyqt5 2024-07-12 10:26:27 +02:00
Egor Savkin 4a88693c32 Update llvmlite to 0.43 and llvm to 15, as in MSYS2 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-07-10 11:06:08 +02:00
Florian Agbuya bd7daa5247 flake: use upstream nixpkgs openocd 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2024-06-26 12:38:02 +08:00
Harry Ying a9a74398ab fix: nix build 
Fix the nix build by rematching the revision of `rustc`

Signed-off-by: Kanyang Ying <lexugeyky@outlook.com>
 2024-06-20 19:03:06 +08:00
Sébastien Bourdeauducq 567cd45eee Merge branch 'master' into nac3 2024-06-20 16:49:54 +08:00
Harry Ying 102506d603 chore: use rust-overlay 
- use rust-overlay, a flake-native and preferred alternative to mozilla-overlay

Signed-off-by: Kanyang Ying <lexugeyky@outlook.com>
 2024-06-20 16:15:20 +08:00
mwojcik 1a1aa07019 remove cargo-xbuild, fix nix build 2024-06-06 10:44:41 +08:00
Sebastien Bourdeauducq c1a86f91d3 bump major version number 2024-06-06 09:47:59 +08:00
Sebastien Bourdeauducq ebc1e3fb76 bump major version number 2024-06-06 09:45:54 +08:00
morgan 77c50324ef flake: update libfringe hash 2024-05-29 14:24:42 +08:00
Sebastien Bourdeauducq eefc07b495 flake: move to nixos 24.05 2024-05-28 17:30:23 +08:00
mwojcik 688e643078 firmware: update rust to 2021-09-01 nightly 2024-05-17 15:36:56 +08:00
mwojcik c33c1df07f remove cargo-xbuild, fix nix build 2024-05-16 16:32:13 +08:00
Sebastien Bourdeauducq 193962f31e flake: update to nixpkgs unstable (soon to be 24.05) 2024-05-06 12:44:45 +08:00
Florian Agbuya dc0b803b19 use nixpkgs sphinxcontrib-wavedrom 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2024-03-27 18:02:49 +08:00
Florian Agbuya bc8bc952d7 use nixpkgs outputcheck 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2024-03-27 18:02:13 +08:00
Sébastien Bourdeauducq d0f893c01c flake: export openocd-bscanspi-f 2024-03-26 15:57:44 +08:00
Sebastien Bourdeauducq 6326051052 flake: forward cmdline arguments in devshell wrappers 2023-12-17 19:42:56 +08:00
Sebastien Bourdeauducq 645b9b8c5f flake: add executable wrappers for frontends to devshell 2023-12-17 13:41:49 +08:00
Sebastien Bourdeauducq 133b26b6ce flake: add ARTIQ sources to PYTHONPATH in devshell 2023-12-17 13:05:16 +08:00
Sebastien Bourdeauducq 8ca75a3fb9 firmware: deal with rust nonsense 
Fixes
"error: edition 2021 is unstable and only available with -Z unstable-options.
error: could not compile `alloc`"
 2023-12-03 11:20:18 +08:00
Florian Agbuya 8381b34a79 flake: add new booktabs dependency for artiq-manual-pdf 2023-12-03 11:18:59 +08:00
Sebastien Bourdeauducq d458fc27bf switch to new nixpkgs release 2023-12-03 11:18:25 +08:00
Florian Agbuya bd61687e8f flake: fix ncurses on vivado 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2023-12-03 10:29:12 +08:00
Sebastien Bourdeauducq 8c520422f2 Revert "flake: fix vivado on recent nixpkgs (closes #2274)" 
This reverts commit 931b3172c4.
 2023-12-03 10:27:01 +08:00
Florian Agbuya 1108cebd75 flake: fix ncurses on vivado 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2023-11-28 17:36:36 +08:00
Florian Agbuya 9a9b3b7858 flake: add new booktabs dependency for artiq-manual-pdf 2023-11-28 10:24:28 +08:00
Florian Agbuya 931b3172c4 flake: fix vivado on recent nixpkgs (closes #2274) 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2023-11-19 11:32:52 +08:00
mwojcik de10e584f6 support .tar flashed idle/startup kernels 2023-11-13 18:14:35 +08:00
Florian Agbuya 378dd0e5ca flake: fix and upgrade wavedrom (closes #2266) 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2023-10-30 08:09:00 +01:00
Florian Agbuya 92391c4763 flake: fix and upgrade wavedrom (closes #2266) 
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
 2023-10-30 07:29:41 +01:00
Sebastien Bourdeauducq 602b680b9d firmware: deal with rust nonsense 
Fixes
"error: edition 2021 is unstable and only available with -Z unstable-options.
error: could not compile `alloc`"
 2023-09-14 10:57:37 +08:00
Sebastien Bourdeauducq 7cffa3f8ff Merge branch 'master' into nac3 2023-09-13 19:21:10 +08:00
Florian Agbuya 2f3329181c flake: fix deprecated 'U' mode in outputcheck for python 3.11 2023-09-06 19:02:41 +08:00
Sebastien Bourdeauducq 1ec1ab0502 flake: update dependencies 2023-09-06 18:28:08 +08:00
Sebastien Bourdeauducq 3452d0c423 efc: use variant (expected everywhere else) 2023-08-25 15:52:40 +08:00
Sebastien Bourdeauducq 3620358f12 flake: build efc firmware 2023-08-25 13:34:56 +08:00
Sebastien Bourdeauducq 72b0a17542 flake: register firmware outputs as hydra build products 2023-08-25 13:25:22 +08:00
Sebastien Bourdeauducq df662c4262 flake: update llvmlite 2023-08-07 23:02:23 +08:00
Sebastien Bourdeauducq d2ac6aceb3 flake: update to Clang 14 2023-08-07 18:45:13 +08:00
Sebastien Bourdeauducq 9b94a09477 flake: update to LLVM 14 2023-08-07 18:28:44 +08:00
David Nadlinger 4d636ea593 Upgrade to LLD 14 
Previous linker versions had inserted some zero padding bytes
between the ELF headers and the first section, but LLD 14 does
not anymore.

Hard-coding the offset of the first section in ksupport.elf
manually isn't ideal; we should probably parse the ELF program
headers instead when first setting up the kernel CPU.
 2023-08-07 10:10:38 +00:00
Sebastien Bourdeauducq 511f125c08 Merge branch 'master' into nac3 2023-07-17 15:45:54 +08:00
Sebastien Bourdeauducq 115415d120 Revert "flake: update to LLVM 14 and llvmlite 0.40.0+master" 
This reverts commit c25c0bd55a.
 2023-06-14 18:54:33 +08:00
Egor Savkin c25c0bd55a
flake: update to LLVM 14 and llvmlite 0.40.0+master 2023-06-09 13:25:08 +08:00