Commit Graph

38 Commits

Author SHA1 Message Date
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
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
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
f072c46ee3 wand: depend on quamash 2020-12-16 15:44:12 +08:00
faedd3e1ea artiq-full: fix typo/syntax 2020-12-12 14:30:57 +08:00
56382d6301 artiq-full: disable flake8-artiq manual 2020-12-10 11:35:50 +08:00
d688ed1a56 extras: add flake8-artiq 2020-12-08 13:45:40 +08:00
eb398dcc53 artiq-full: package wand 2020-11-23 23:23:02 +08:00
6cbfebf626 artiq-full: update wavedrom 2020-10-07 19:30:04 +08:00
8fc3860e9d conda-channel: create win-64 output 2020-06-14 22:50:02 +08:00
1ffce94d92 conda: handle architecture-dependent packages in channel 2020-06-10 12:05:01 +08:00
ef8664443a artiq-full: fix more conda paths 2020-06-09 16:24:14 +08:00
ffaa3f74ec artiq-full: fix conda paths 2020-06-09 16:11:08 +08:00
3cface01af artiq-comtools: bump 2020-04-25 12:47:23 +08:00
3091d20e23 fix previous commit 2020-01-29 10:01:34 +08:00
29da8f5ab2 bump toptica-lasersdk-artiq 2020-01-27 22:59:38 +08:00
e283196520 highfinesse-net: bump 2019-11-26 23:28:45 +08:00
961dcac63d add conda package for toptica-lasersdk-artiq 2019-11-14 17:12:17 +08:00
5797648204 build artiq-comtools 2019-11-14 15:22:17 +08:00
184de89074 hut2: bump 2019-11-12 22:18:38 +08:00
f17599940b sipyco: use timestamp file 2019-11-12 19:37:10 +08:00
57b817f07e build sipyco manual 2019-11-12 10:43:50 +08:00
eae4612ecb conda-artiq-board: BIOS -> bootloader 2019-11-09 18:59:45 +08:00
9b0bead69b package sipyco and use for controllers 2019-11-07 19:34:36 +08:00
52792c38e1 conda-channel: symlink packages instead of copying them 2019-10-07 13:14:40 +08:00
b6b0080649 conda-channel: package name 2019-07-18 00:15:11 +08:00
fc0d2144ba create a conda channel 2019-07-18 00:08:35 +08:00
8921993d15 fix manual build 2019-07-17 22:48:14 +08:00
14c0bd7103 move conda-artiq-board to artiq-full 2019-07-17 22:36:44 +08:00
11608e139c move artiq-extras to artiq-full 2019-07-17 20:22:13 +08:00
c5ade34066 move manual to artiq-full 2019-07-17 20:02:06 +08:00