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
2021-02-02 11:16:24 +08:00
21f5362b6f
stm32: fix stabilizer IP address override
...
* required by at least 659a6879f7
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: #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
a45b6fc771
misoc: bump
2020-12-22 23:46:51 +08:00
228a73fc55
artiq-full: remove vlbai leftovers
2020-12-22 22:40:18 +08:00
e97e8be246
artiq-full: move nist2 to 6+ (kasli2)
2020-12-22 09:34:44 +08:00
2814292f05
jesd204: bump
2020-12-19 17:04:59 +08:00
cefb3ce2f2
vlbai*: deactivate
2020-12-19 09:42:45 +01:00
2f2ed2b68e
disable mpik
2020-12-17 18:34:58 +01:00
718230f12a
remove hub,opticlock,ptb
2020-12-17 18:06:31 +01: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
Drew Risinger
beb99234fe
conda build: allow pname or name convention
2020-12-17 14:16:45 +08:00
f072c46ee3
wand: depend on quamash
2020-12-16 15:44:12 +08:00
abf17296c8
artiq-full: build nus
2020-12-15 09:46:45 +08:00
755f36ecdf
artiq-full: build ucsb
2020-12-14 21:23:48 +08:00
0c3cb62cde
artiq-full: use uTCA for sayma-satellite-st
2020-12-14 11:38:33 +08:00
