Sebastien Bourdeauducq
58aabaaa0e
example-user-env: disable spyder
2021-01-28 12:22:27 +08:00
Sebastien Bourdeauducq
eac7f4bddb
Revert "artiq: move stable to nixpkgs 20.09"
...
This reverts commit b810407aa9
2021-01-28 12:21:09 +08:00
Sebastien Bourdeauducq
b810407aa9
artiq: move stable to nixpkgs 20.09
2021-01-27 13:14:12 +08:00
Sebastien Bourdeauducq
e39f359122
bump sipyco
2021-01-27 13:09:08 +08:00
occheung
049de83093
artiq-full: build hw3
2021-01-26 15:17:12 +08:00
Sebastien Bourdeauducq
221d2fe793
example-user-env: artiq-5 compat
2021-01-18 15:21:45 +08:00
Sebastien Bourdeauducq
8b59734705
example-user-env: add flake8-artiq
2021-01-18 15:20:42 +08:00
Sebastien Bourdeauducq
360eb10ada
update flake8-artiq
2021-01-18 15:19:55 +08:00
Sebastien Bourdeauducq
4d99f4884e
example-user-env: matplotlib-qt issues
2021-01-15 17:48:59 +08:00
Sebastien Bourdeauducq
45f46f8901
add user environment test
2021-01-15 17:23:19 +08:00
Sebastien Bourdeauducq
7ee9e4f068
fix syntax
2021-01-15 17:22:48 +08:00
Sebastien Bourdeauducq
8396cfa1cb
extras: update controllers
2021-01-15 16:53:54 +08:00
Sebastien Bourdeauducq
7a76d08cb0
simplify/fix jsonschema dependency
2021-01-15 16:36:48 +08:00
Astro
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
Sebastien Bourdeauducq
2984cff156
artiq-full: disable archived variants
2021-01-15 16:30:29 +08:00
occheung
3cd8e64846
artiq-full: build stfc master + satellite
2021-01-15 13:05:22 +08:00
occheung
f5145e23ee
artiq-full: build okinawa
2021-01-05 12:43:59 +08:00
occheung
58b49c173e
artiq-full: build nist3
2020-12-29 13:29:33 +08:00
occheung
d4c78c8d1b
artiq-full: build berkeley3 master + satellite
2020-12-28 16:05:03 +08:00
Astro
cc6e7095f3
artiq-full: add a boardsWithoutBuildSplit blacklist
2020-12-27 02:04:47 +01:00
Astro
e189ee4c8f
artiq-board: refactor vivado derivations into discardContextFromPath, tighten software src
2020-12-23 18:03:40 +01:00
Astro
2f4b063513
artiq-board: use new misoc top-level Makefile for software build
2020-12-23 17:46:31 +01:00
Astro
0cf2def070
artiq-board: move software build into separate derivation
2020-12-23 17:46:12 +01:00
Astro
22a6d5fb2e
artiq-full: fix artiq-board paths
2020-12-23 15:31:14 +01:00
Astro
1c103ccb62
artiq-fast: move new artiq-board.nix to artiq-full/
2020-12-23 15:31:14 +01:00
Sebastien Bourdeauducq
42df27a7fd
misoc: bump
2020-12-23 12:01:37 +08:00
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
Sebastien Bourdeauducq
a45b6fc771
misoc: bump
2020-12-22 23:46:51 +08:00
Sebastien Bourdeauducq
228a73fc55
artiq-full: remove vlbai leftovers
2020-12-22 22:40:18 +08:00
occheung
e97e8be246
artiq-full: move nist2 to 6+ (kasli2)
2020-12-22 09:34:44 +08:00
Sebastien Bourdeauducq
2814292f05
jesd204: bump
2020-12-19 17:04:59 +08:00
Robert Jördens
cefb3ce2f2
vlbai*: deactivate
2020-12-19 09:42:45 +01:00
Robert Jördens
2f2ed2b68e
disable mpik
2020-12-17 18:34:58 +01:00
Robert Jördens
718230f12a
remove hub,opticlock,ptb
2020-12-17 18:06:31 +01:00
Drew Risinger
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
beb99234fe
conda build: allow pname or name convention
2020-12-17 14:16:45 +08:00
Sebastien Bourdeauducq
f072c46ee3
wand: depend on quamash
2020-12-16 15:44:12 +08:00
occheung
abf17296c8
artiq-full: build nus
2020-12-15 09:46:45 +08:00
occheung
755f36ecdf
artiq-full: build ucsb
2020-12-14 21:23:48 +08:00
Sebastien Bourdeauducq
0c3cb62cde
artiq-full: use uTCA for sayma-satellite-st
2020-12-14 11:38:33 +08:00
occheung
d1f7e5d25f
add wipm7 device database
2020-12-14 11:18:42 +08:00
occheung
73d7fe2502
artiq-full: build wipm7 master + satellite
2020-12-14 09:37:08 +08:00
Sebastien Bourdeauducq
eb48b4a6b8
artiq-fast: do not put both quamash and qasync in conda channel
...
This causes conda's lame excuse for a dependency solver to break, as usual.
2020-12-12 22:27:23 +08:00
Sebastien Bourdeauducq
093b1b7224
artiq-fast: quamash -> qasync on artiq-6+
2020-12-12 21:58:04 +08:00
Sebastien Bourdeauducq
faedd3e1ea
artiq-full: fix typo/syntax
2020-12-12 14:30:57 +08:00
Sebastien Bourdeauducq
56382d6301
artiq-full: disable flake8-artiq manual
2020-12-10 11:35:50 +08:00
Robert Jördens
6721a8ea17
Merge remote-tracking branch 'quartiq/master'
...
* quartiq/master:
added innsbruck5
added basel
add ptb8
2020-12-09 20:07:02 +01:00
08241d9ab0
added innsbruck5
2020-12-09 16:08:38 +00:00
Sebastien Bourdeauducq
7259a0b3aa
artiq-full: disable archived variants
2020-12-09 12:26:23 +08:00
b17a99ac3b
added basel
2020-12-08 16:22:15 +01:00
Sebastien Bourdeauducq
occheung
Astro
Drew Risinger
Robert Jördens
Drew Risinger
SingularitySurfer