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
d1f7e5d25f
add wipm7 device database
2020-12-14 11:18:42 +08:00
73d7fe2502
artiq-full: build wipm7 master + satellite
2020-12-14 09:37:08 +08:00
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
093b1b7224
artiq-fast: quamash -> qasync on artiq-6+
2020-12-12 21:58:04 +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
6721a8ea17
Merge remote-tracking branch 'quartiq/master'
...
* quartiq/master:
added innsbruck5
added basel
add ptb8
2020-12-09 20:07:02 +01:00
SingularitySurfer
08241d9ab0
added innsbruck5
2020-12-09 16:08:38 +00:00
7259a0b3aa
artiq-full: disable archived variants
2020-12-09 12:26:23 +08:00
SingularitySurfer
b17a99ac3b
added basel
2020-12-08 16:22:15 +01:00
SingularitySurfer
3d26cd62cf
add ptb8
2020-12-08 16:22:15 +01:00
SingularitySurfer
8771512787
added basel
2020-12-08 13:24:07 +00:00
d688ed1a56
extras: add flake8-artiq
2020-12-08 13:45:40 +08:00
ea292df252
artiq-full: add artiq-board-sayma-satellite-st
2020-12-07 18:09:12 +08:00
00352b9942
artiq-board, artiq-board-legacy: dontFixup board packages
...
resolves gitea issue #35
2020-12-02 17:07:19 +01:00
SingularitySurfer
cf4ca3e4f2
add ptb8
2020-12-02 15:22:35 +00:00
eab83a6a3f
artiq-fast: build gateware from a self-contained separate source derivation ( #23 )
...
artiq-fast: add nativeBuildInputs to artiq-board-legacy.nix
artiq-board: fix scope of toPythonModule
artiq-board: use new --gateware-identifier-str
artiq-board: use legacy code for artiq<6
artiq-board: get/remove/re-add version identifiers
artiq-fast: build gateware from a self-contained separate source derivation
Addresses item 2. of Gitea issue #1 .
Co-authored-by: Stephan Maka <stephan@spaceboyz.net>
Reviewed-on: M-Labs/nix-scripts#23
2020-12-02 17:22:54 +08:00
262ef72eb7
artiq-full: build apm
2020-11-30 18:25:22 +08:00
12fbe64616
artiq-fast: add strictDeps=true to fetchcargo.nix, nativeBuildInputs to artiq-board.nix
...
this indeed cuts runtime dependencies (gitea issue #34 )
2020-11-26 17:10:36 +01:00
6acf5b3f93
innsbruck4, ubirmingham2: add
2020-11-26 15:56:10 +01:00
5695977531
Revert "artiq-board.nix: move compilers into nativeBuildInputs"
...
This reverts commit fd25af0733
2020-11-25 21:23:03 +01:00
2e62831998
Revert "artiq-fast: add strictDeps=true to fetchcargo.nix"
...
This reverts commit 843da12452
2020-11-25 21:23:02 +01:00
fd25af0733
artiq-board.nix: move compilers into nativeBuildInputs
...
Part of Gitea issue #34
2020-11-25 18:19:03 +01:00
843da12452
artiq-fast: add strictDeps=true to fetchcargo.nix
...
part of gitea issue #34 . unfortunately, the flag has inferior
documentation, so this is just a try.
2020-11-25 18:05:51 +01:00
Drew Risinger
267b497ac4
python3Packages.pyqtgraph: 0.10.0 -> 0.11.0
2020-11-24 23:14:17 +08:00
ff54c815d5
artiq-full: move ptb7 to 6+ (kasli2)
2020-11-24 00:10:49 +08:00
eb398dcc53
artiq-full: package wand
2020-11-23 23:23:02 +08:00
88cd472f90
innsbruck3: artiq 6
2020-11-17 18:55:03 +01:00
6eac1b5f3f
ptb3master/satellite: fix artiq major version restrictions
2020-11-17 18:53:32 +01:00
c31b0144d3
innsbruck3, ptb7: add
2020-11-16 08:42:48 +00:00
34c5ff76b9
ptb2/3: refactor
2020-11-16 08:42:32 +00:00
571cfbd8a6
python-deps: bump migen, migen-axi
2020-11-12 15:43:17 +01:00
0db0ffb128
zynq: power off board when done
2020-11-10 22:49:07 +08:00
083e389b41
artiq-fast: put board lockfile into separate directory
...
Files at the root of /tmp cannot be written by different users for some reason.
2020-11-10 22:47:48 +08:00
777b9dbecd
phaser: remove inappropriate load-after-build code
2020-11-09 13:45:36 +08:00
0a11450df3
migen: bump
2020-11-06 12:32:51 +08:00
