Commit Graph

300 Commits

Author SHA1 Message Date
54157028c9 riscv support in beta version (WIP) 2021-09-12 18:17:47 +08:00
4e00857fe1 misoc: bump 2021-09-12 17:14:41 +08:00
45c3fa1817 apply Mozilla nixpkgs overlay
This is preparing for RISC-V firmware compilation.
2021-09-12 17:12:16 +08:00
91a583c960 wfvm: update 2021-09-09 20:50:53 +08:00
498cb074af update wfvm 2021-09-06 09:18:30 +08:00
495dc7ee4e updated migen-axi dependency to 1f94ee0 2021-08-24 13:31:14 +02:00
be78fd8b77 pythonparser: bump 2021-08-12 13:20:41 +08:00
73a895b6e9 artiq: use nixpkgs pyqtgraph 2021-08-12 13:00:19 +08:00
43e02c4f8f updated migen rev to 27dbf03 2021-08-10 12:50:58 +02:00
ff4995e9ea misoc: bump 2021-08-05 16:16:57 +08:00
c5fb1c8038 migen: bump
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
2021-08-03 20:14:52 +08:00
bb1585fbbd openocd: revert to lambdaconcept patch 2021-07-29 15:30:09 +08:00
8d8ea8b377 bump misoc-new 2021-07-29 14:49:12 +08:00
1319a2f536 openocd: clean up SPI flash patch (#62) 2021-07-27 18:34:56 +08:00
367c3d5ed5 openocd: better SPI flash patch (#62) 2021-07-27 18:33:50 +08:00
9a76e0fdb6 openocd: patch SPI flash snafu. Closes #62 2021-07-27 18:25:35 +08:00
e79318171b update misoc
Use misoc with newer (risc-v) libunwind for beta.
Update misoc for ARTIQ legacy to the version used in stable, so we do not have to carry too many versions around.
unstable-2021-02-15 has seen good testing with 10/100 Ethernet support on Kasli being the main change.
2021-07-27 11:08:44 +08:00
c9efc20aeb switch everything to nixpkgs 21.05
No problems found during testing and OpenOCD changes make HITL tricky while keeping 20.09.
2021-07-27 10:25:12 +08:00
f595103f17 conda: fix access to bscan-spi-bitstreams 2021-07-26 17:21:57 +08:00
2355ba148a openocd: use upstream nixpkgs version if recent enough 2021-07-26 17:06:05 +08:00
591ef2b4a6 upgrade Windows conda test environment to Python 3.8 2021-07-05 20:59:28 +08:00
f581b6a649 allow Python 3.8 with conda 2021-07-05 20:42:18 +08:00
f35ae55a15 keep old WFVM/conda for ARTIQ legacy 2021-07-05 20:34:18 +08:00
ffe1fd2274 update WFVM 2021-07-05 16:09:18 +08:00
c8742678c4 update Windows conda test environment 2021-07-05 16:07:39 +08:00
db1bd9d5ae update Anaconda 2021-07-05 15:21:53 +08:00
Drew Risinger
005d911fb7 artiq: fix fontconfig warning on non-NixOS
Previous warning:
```
Fontconfig warning: "/etc/fonts/fonts.conf", line 5: unknown element "its:rules"
Fontconfig warning: "/etc/fonts/fonts.conf", line 6: unknown element "its:translateRule"
Fontconfig error: "/etc/fonts/fonts.conf", line 6: invalid attribute 'translate'
Fontconfig error: "/etc/fonts/fonts.conf", line 6: invalid attribute 'selector'
Fontconfig error: "/etc/fonts/fonts.conf", line 7: invalid attribute 'xmlns:its'
Fontconfig error: "/etc/fonts/fonts.conf", line 7: invalid attribute 'version'
Fontconfig warning: "/etc/fonts/fonts.conf", line 9: unknown element "description"
Fontconfig error: Cannot load config file from /etc/fonts/fonts.conf
```
Ref: https://discourse.nixos.org/t/fonts-in-nix-installed-packages-on-a-non-nixos-system/5871/7
2021-06-04 17:09:44 -04:00
63be59a677 migen-axi: fix test dependencies 2021-06-02 08:09:54 +08:00
bdd57d8895 migen-axi: relax dependency versioning 2021-06-02 08:09:39 +08:00
2c146918a9 limit rustc version used to compile cargo. Closes #47 2021-06-02 07:58:56 +08:00
9c3e77446c openocd: limit autocrap version 2021-06-01 19:42:39 +08:00
Drew Risinger
10e6220703 jesd204b: bump
No changes other than to setup/packaging. This removes the tests/
directory from the Nix output, to prevent collisions with other
packages.
https://github.com/m-labs/jesd204b/pull/15/
2021-05-05 18:59:14 -04:00
84fc1375d1 s/stdenv.lib/lib/ 2021-03-11 17:32:26 +01:00
b8a803a64f conda: require python<3.8 for llvmlite 2021-03-01 15:35:30 +08:00
4e9339e3a8 misoc: bump 2021-02-28 14:31:52 +08:00
0c3f5161e1 misoc: bump 2021-02-15 21:44:13 +08:00
a6ea6e3666 migen: bump 2021-02-15 18:44:00 +08:00
64ee51b673 artiq-full: split code generation into artiq-board-generated jobset 2021-02-15 04:15:09 +01:00
d5b5dbeeb2 migen-axi: bump 2021-01-30 18:24:05 +08:00
57aca5d142 migen: bump 2021-01-30 18:22:22 +08:00
David Nadlinger
87fdb2c5ea Export qasync from artiq-fast
This makes it easier to pull in qasync from custom dev environments
(artiq-fast.qasync).
2021-01-29 14:29:22 +00:00
e39f359122 bump sipyco 2021-01-27 13:09:08 +08:00
7a76d08cb0 simplify/fix jsonschema dependency 2021-01-15 16:36:48 +08:00
22a6d5fb2e artiq-full: fix artiq-board paths 2020-12-23 15:31:14 +01:00
1c103ccb62 artiq-fast: move new artiq-board.nix to artiq-full/ 2020-12-23 15:31:14 +01:00
42df27a7fd misoc: bump 2020-12-23 12:01:37 +08:00
Drew Risinger
2577aa52c0 artiq: pass wrapped python env to subprocesses
Fixes https://github.com/m-labs/artiq-comtools/issues/7.
Basically, python subprocesses can't see all installed python packages
in a python environment because it uses the wrong Python exe (i.e. it
doesn't use the wrapped exe). This patches the PATH in the binary
wrappers (e.g. */bin/artiq_session) to include the correct python path.
2020-12-23 10:55:43 +08:00
a45b6fc771 misoc: bump 2020-12-22 23:46:51 +08:00
2814292f05 jesd204: bump 2020-12-19 17:04:59 +08:00
ca28925120 treewide: name -> pname where possible
Changes "name = '...-${version}" -> "pname = '...'" syntax everywhere
that is easy.
This matches current best nixpkgs convention.
The nixpkgs standard derivation will convert this to name =
"${pname}-${version}" automatically.
This also has the added benefit of adding the version to the filepath
for several packages that didn't have it before.

The only remaining files are ./artiq-full/extras.nix &
./artiq-fast/pkgs/python-deps.nix.
extras.nix had a
semi-confusing function that I didn't want to mess with.
2020-12-17 14:16:45 +08:00