Commit Graph

255 Commits

Author SHA1 Message Date
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
2814292f05 jesd204: bump 2020-12-19 17:04:59 +08: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
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
00352b9942 artiq-board, artiq-board-legacy: dontFixup board packages
resolves gitea issue #35
2020-12-02 17:07:19 +01: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
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
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
571cfbd8a6 python-deps: bump migen, migen-axi 2020-11-12 15:43:17 +01:00
0a11450df3 migen: bump 2020-11-06 12:32:51 +08:00
30629929a8 migen: bump 2020-11-06 12:25:21 +08:00
b46f418176 add artiq-netboot package 2020-10-15 16:12:51 +08:00
24510c81d6 python-deps: update migen-axi 2020-10-14 20:30:59 +08:00
ee9983728e update migen+misoc 2020-10-12 22:33:40 +08:00
5ba0896be6 migen: bump 2020-09-17 16:39:38 +08:00
1c43932205 cleanup/fix python-deps import 2020-08-01 10:40:00 +08:00
60e554c501 artiq: use new misoc for artiq-6 2020-08-01 10:31:07 +08:00
7b27d68841 artiq: apply Qt wrapper to artiq_session 2020-08-01 10:20:15 +08:00
3c463f7397 artiq-board: mention asm/llvm_asm 2020-07-29 13:38:53 +08:00
4a1de56ce5 artiq-board: update cargo
Older version doesn't compile with new rustc due to asm/llvm_asm breaking change.
2020-07-29 13:37:21 +08:00
7001d011fd update pythonparser patch for conda 2020-07-28 13:18:07 +08:00
454c3d806c hack-patch pythonparser for python 3.8 2020-07-28 10:46:29 +08:00
4ef1b6e76d artiq-board: disable timing check 2020-07-26 23:51:19 +08:00
be5787ab55 conda-windows/binutils-recipe: change to --build=x86_64-w64-mingw32
Fixes Gitea issue #28
2020-07-24 10:01:37 +08:00
bc447638a9 Revert "conda-windows-binutils-or1k: build with msys2, not conda"
This reverts commit 3409eb3c11.
2020-07-24 09:35:29 +08:00
7f32f8e438 Revert "conda-windows-binutils-arm: likewise"
This reverts commit 1d7b1e9175.
2020-07-24 09:35:06 +08:00
89d700a796 windows/binutils: change to --build=x86_64-w64-mingw32 2020-07-24 09:33:49 +08:00
1d7b1e9175 conda-windows-binutils-arm: likewise 2020-07-22 08:24:37 +08:00
3409eb3c11 conda-windows-binutils-or1k: build with msys2, not conda 2020-07-22 06:43:56 +08:00
6c328f32f1 migen-axi: bump 2020-07-19 14:04:50 +08:00
e75d16f55a artiq: fix use of Qt 2020-07-17 11:48:43 +08:00
cc00cfc1a8 wfvm: bump 2020-07-14 15:28:00 +08:00
888481c0ce typo 2020-07-12 23:20:31 +08:00
cc5694dedf artiq-board: allow setting src 2020-07-12 23:19:40 +08:00
e0a9253084 migen: bump 2020-07-11 09:50:42 +08:00
fe8417e229 windows: add a doc note to make_conda_packages.sh 2020-07-10 00:49:56 +02:00
088a101d89 windows: doc make_conda_packages.sh 2020-07-01 17:56:52 +02:00
8c508de922 artiq: add binutils-arm dependency for 6.0+ 2020-06-28 17:29:40 +08:00
48bc991c7c move wfvm.nix into artiq-fast
Avoids issue with generatedNix
2020-06-28 14:50:44 +08:00
4cd7a559e8 use external WFVM, pin WFVM nixpkgs 2020-06-28 14:46:32 +08:00
005792ed77 wfvm: restrict distribution of VS layout 2020-06-28 13:56:43 +08:00
64224a0b51 wfvm: cleanup 2020-06-28 13:56:28 +08:00