1
0
forked from M-Labs/artiq
Commit Graph

221 Commits

Author SHA1 Message Date
8d5cfcbe4d Merge branch 'master' into nac3 2024-12-17 17:39:34 +08:00
62faca81e9 flake: remove pythonparser 2024-12-17 17:17:10 +08:00
0daa743aff Merge branch 'master' into nac3 2024-12-17 17:14:44 +08:00
Charlie Root
9a8338d71b flake: format using alejandra 2024-12-15 20:40:08 +08:00
Charlie Root
db293d5ecd flake: add alejandra as a formatter 2024-12-15 20:40:08 +08:00
Charlie Root
67dde30625 flake: clean up qt paths 2024-12-11 23:17:41 +08:00
Charlie Root
2508ff4812 flake: clean up devShells
Move both devShells into devshells.<...>,
switch from buildInputs to packages
2024-12-11 22:12:46 +08:00
Charlie Root
6097a32f4a flake: move defaultPackage.<system> to packages.<system>.default
change deprecated defaultPackage.x86_64-linux to
packages.x86_64-linux.default,
remove unneeded ps
2024-12-02 12:09:58 +08:00
145a973213 flake: factor out Qt paths into exported variable
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
2024-11-25 11:45:32 +08:00
Charlie Root
bca30becbf flake.nix: clean up inputs
- Put all inputs into a single attrSet to improve readabiliy
- Fix deprecated links since links without quotes surrounding them have
been deprecated for quite some time.
2024-11-09 15:01:20 +08:00
b4085312b0 flake: add paramiko ed25519 dependencies 2024-10-31 11:35:08 +08:00
6afbd90c59 update dependencies 2024-10-08 15:11:34 +08:00
333623e24b flake: update asyncserial
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
2024-10-01 14:45:17 +08:00
5b63cbe986 flake: update qasync, sync with nixpkgs 2024-09-30 14:58:21 +08:00
5dcdeb6e0d flake: update qasync, sync with nixpkgs 2024-09-30 14:58:02 +08:00
Charles Baynham
5912142836 nix: add paramiko to boards environment for lightweight flashing 2024-09-06 20:46:46 +08:00
770896a64b flake: run HITL tests 2024-08-31 22:01:52 +08:00
52196bb36e Merge branch 'master' into nac3 2024-08-30 14:40:24 +08:00
583a4ceadd
switch from appdirs to platformdirs 2024-08-27 13:59:05 +08:00
d28355541a flake: update dependencies, use rust overlay snapshot 2024-08-14 16:52:46 +08:00
2f76ac4de6 flake: fix rust installation 2024-08-14 16:51:07 +08:00
775aff730e flake/sphinx: add tikz for diagrams 2024-08-13 14:50:13 +08:00
1b28e38d51 flake/sphinx: fix errors in manual nix build 2024-08-01 18:49:21 +08:00
468ace0e6d Revert "flake: avoid permissions race window when setting up HITL SSH key"
This reverts commit 75ffbeba4d.
2024-08-01 07:35:20 +08:00
75ffbeba4d
flake: avoid permissions race window when setting up HITL SSH key 2024-07-30 11:24:21 +08:00
f6800bdba2 Merge branch 'master' into nac3 2024-07-27 23:33:01 +08:00
2d7bdce3b8 Revert "flake: update pyqt5"
This reverts commit 846d0f9249.
2024-07-27 22:21:14 +08:00
b588295063 flake: switch to nixpkgs unstable (py3.12), update nix deps 2024-07-27 21:49:33 +08:00
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
846d0f9249 flake: update pyqt5 2024-07-12 10:26:27 +02:00
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
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
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
1a1aa07019 remove cargo-xbuild, fix nix build 2024-06-06 10:44:41 +08:00
c1a86f91d3 bump major version number 2024-06-06 09:47:59 +08:00
ebc1e3fb76 bump major version number 2024-06-06 09:45:54 +08:00
77c50324ef flake: update libfringe hash 2024-05-29 14:24:42 +08:00
eefc07b495 flake: move to nixos 24.05 2024-05-28 17:30:23 +08:00
688e643078 firmware: update rust to 2021-09-01 nightly 2024-05-17 15:36:56 +08:00
c33c1df07f remove cargo-xbuild, fix nix build 2024-05-16 16:32:13 +08:00
193962f31e flake: update to nixpkgs unstable (soon to be 24.05) 2024-05-06 12:44:45 +08:00
dc0b803b19 use nixpkgs sphinxcontrib-wavedrom
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
2024-03-27 18:02:49 +08:00
bc8bc952d7 use nixpkgs outputcheck
Signed-off-by: Florian Agbuya <fa@m-labs.ph>
2024-03-27 18:02:13 +08:00
d0f893c01c flake: export openocd-bscanspi-f 2024-03-26 15:57:44 +08:00
6326051052 flake: forward cmdline arguments in devshell wrappers 2023-12-17 19:42:56 +08:00
645b9b8c5f flake: add executable wrappers for frontends to devshell 2023-12-17 13:41:49 +08:00
133b26b6ce flake: add ARTIQ sources to PYTHONPATH in devshell 2023-12-17 13:05:16 +08:00