Commit Graph

1125 Commits

Author SHA1 Message Date
33c33d49df artiq-full: replace variants list with readDir of sinara-systems 2021-02-11 21:41:23 +01:00
d1a6c2f5db artiq-full: disable archived variants 2021-02-07 09:43:56 +08:00
5c6dc61d4d mcu: missing file rename from 0d706f000f 2021-02-06 22:05:00 +08:00
87c2586250 mcu: add Hydra Git input for Sayma MMC firmware 2021-02-06 22:03:13 +08:00
42107ff1e9 mcu: build Sayma MMC firmware 2021-02-06 22:00:54 +08:00
0d706f000f stm32 -> mcu 2021-02-06 21:45:40 +08:00
29b4cb1b09 artiq-full: add stanford 2021-02-04 16:08:25 +08:00
b83f40008c artiq-full: add cu2 2021-02-04 14:44:48 +08:00
6d0dafb722 artiq-full: add cu3 2021-02-04 12:35:35 +08:00
f1d689ae78 artiq-full: add sydney2 2021-02-04 10:46:22 +08:00
487bf219ba artiq-full: build illinois 2021-02-03 17:55:48 +08:00
4666f1aa6a artiq-full: concatenate paths as paths not strings
fixes running with restrict-eval=true on Hydra
2021-02-02 13:24:02 +01:00
d149c66d05 artiq-full: move reading standalone flag from sinara-systems to before generatedNix 2021-02-02 13:23:31 +01:00
3c1a84a07e Revert "artiq-full: move reading standalone flag from sinara-systems to before generatedNix"
hydra-eval-jobs returned exit code 1:
error: --- Error --- hydra-eval-jobs
worker error: error: --- RestrictedPathError --- hydra-eval-jobs
access to path '/nix/store/xq8mnh5rf5v0www2amzvlbf8m6r0ckjv-pm405hs1s21h4p3bq7fg2vcwwc1gqcfv-source/apm.json' is forbidden in restricted mode

This reverts commit b0e041c716.
2021-02-02 15:29:26 +08:00
70a0b8f90f artiq-full: let drtio-ddbs depend on one json file instead of full sinara-systems 2021-02-02 15:11:52 +08:00
b0e041c716 artiq-full: move reading standalone flag from sinara-systems to before generatedNix 2021-02-02 15:11:52 +08:00
6fe5a903b9 stm32: update stabilizer IP address override
* Affected by 2144af5bcd .
2021-02-02 12:16:10 +08:00
726ee7aa82 stm32: allow binary filename and package name to be different
* The major motivation is that Stabilizer ( since f1f15aca65 ) now contains multiple binaries, and the filenames of the generated ELFs (e.g. `dual-iir`, `lockin-internal`) do not necessarily contain the project name as a substring.
2021-02-02 11:16:24 +08:00
21f5362b6f stm32: fix stabilizer IP address override
* required by at least 659a6879f7 or later
* also substitutes the default gateway address (24-bit netmask)
2021-02-01 16:40:28 +08:00
35c2844612 artiq-full: build cu 2021-02-01 12:18:09 +08: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
58aabaaa0e example-user-env: disable spyder 2021-01-28 12:22:27 +08:00
eac7f4bddb Revert "artiq: move stable to nixpkgs 20.09"
This reverts commit b810407aa9.
2021-01-28 12:21:09 +08:00
b810407aa9 artiq: move stable to nixpkgs 20.09 2021-01-27 13:14:12 +08:00
e39f359122 bump sipyco 2021-01-27 13:09:08 +08:00
049de83093 artiq-full: build hw3 2021-01-26 15:17:12 +08:00
221d2fe793 example-user-env: artiq-5 compat 2021-01-18 15:21:45 +08:00
8b59734705 example-user-env: add flake8-artiq 2021-01-18 15:20:42 +08:00
360eb10ada update flake8-artiq 2021-01-18 15:19:55 +08:00
4d99f4884e example-user-env: matplotlib-qt issues 2021-01-15 17:48:59 +08:00
45f46f8901 add user environment test 2021-01-15 17:23:19 +08:00
7ee9e4f068 fix syntax 2021-01-15 17:22:48 +08:00
8396cfa1cb extras: update controllers 2021-01-15 16:53:54 +08:00
7a76d08cb0 simplify/fix jsonschema dependency 2021-01-15 16:36:48 +08:00
ce676be8e4 artiq: add dependency jsonschema (#38)
artiq: add dependency jsonschema

Support for resolution of https://github.com/m-labs/artiq/issues/1474

Co-authored-by: Stephan Maka <sm@m-labs.hk>
Reviewed-on: M-Labs/nix-scripts#38
Co-Authored-By: Astro <sm@m-labs.hk>
Co-Committed-By: Astro <sm@m-labs.hk>
2021-01-15 16:32:55 +08:00
2984cff156 artiq-full: disable archived variants 2021-01-15 16:30:29 +08:00
3cd8e64846 artiq-full: build stfc master + satellite 2021-01-15 13:05:22 +08:00
f5145e23ee artiq-full: build okinawa 2021-01-05 12:43:59 +08:00
58b49c173e artiq-full: build nist3 2020-12-29 13:29:33 +08:00
d4c78c8d1b artiq-full: build berkeley3 master + satellite 2020-12-28 16:05:03 +08:00
cc6e7095f3 artiq-full: add a boardsWithoutBuildSplit blacklist 2020-12-27 02:04:47 +01:00
e189ee4c8f artiq-board: refactor vivado derivations into discardContextFromPath, tighten software src 2020-12-23 18:03:40 +01:00
2f4b063513 artiq-board: use new misoc top-level Makefile for software build 2020-12-23 17:46:31 +01:00
0cf2def070 artiq-board: move software build into separate derivation 2020-12-23 17:46:12 +01: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