Commit Graph

293 Commits

Author SHA1 Message Date
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
6eecb5085d wfvm: move out MSYS2 package list 2020-06-27 17:22:34 +08:00
486b343b15 windows: update conda dependencies for beta test 2020-06-27 17:06:55 +08:00
30f205680f wfvm: add RESTRICTDIST- to names of nonfree output paths
Preparation for M-Labs/nix-scripts#26
2020-06-26 20:48:34 +02:00
c00c10e223 artiq-board: fix and simplify check for timing criteria
Re-fixes Gitea issue #15
2020-06-25 00:21:48 +02:00
e87d2b4ecd windows: add back test timeout 2020-06-24 22:28:16 +08:00
d809926d10 conda-windows: try fixing llvmlite-artiq setup.py install 2020-06-24 22:22:00 +08:00
e347cb7c4b conda-windows: use compiled llvm-or1k for llvmlite-artiq 2020-06-23 22:27:18 +08:00
9733ec3509 llvm-or1k: bump 2020-06-23 21:18:37 +08:00
ed313133b8 conda-windows: fix llvm-or1k yaml syntax 2020-06-23 19:49:28 +08:00
69d8e02853 conda-windows: build llvmlite with VS, again 2020-06-23 19:48:53 +08:00
80bf1d300e wfvm: cleanup 2020-06-23 19:06:53 +08:00
536d45012e conda-windows: build llvm with VS, second attempt 2020-06-23 16:24:59 +08:00
4158527dba wfvm: add back MSVC 2020-06-23 16:24:59 +08:00
8111b2f42b windows: run tests using WFVM 2020-06-22 17:45:18 +08:00
1b79bdaa20 wfvm: set -e in scripts 2020-06-22 17:24:53 +08:00
7ca6ada7ee conda-windows: do not set msys path twice in binutils 2020-06-22 16:53:40 +08:00
3766781a24 windows: do not use idiotic .conda files 2020-06-22 16:48:11 +08:00
5dc2ed0c79 conda: do not depend on Python
python dependency just seems to cause more misbehavior of the crappy conda dep handler.
2020-06-22 15:41:28 +08:00
72d4eab21b conda: remove version specification from deps
They just seem to tickle bugs in conda's shitty excuse for a dependency solver.
2020-06-22 15:29:00 +08:00
11dfff09b9 artiq-fast: fix a448d3bdc 2020-06-22 15:22:25 +08:00
97bb368cab conda: do not specify h5py 2.8
h5py 2.8 sometimes causes the conda crap to install Python 3.5.
2020-06-22 15:18:47 +08:00
a448d3bdc0 artiq-fast: organize 2020-06-22 15:13:02 +08:00
05cde854dd windows: add script to automatically download conda dependencies and create fetchurl nix files 2020-06-22 14:56:02 +08:00
bd8fa5d955 wfvm: support disabling fake RTC
Avoids SSL 'certificate not yet valid' errors.
2020-06-22 14:43:02 +08:00
d895203b5b conda-windows: add binutils-arm again 2020-06-22 12:57:52 +08:00
7838d6e683 conda-windows: make binutils generic 2020-06-22 12:57:29 +08:00
b2e40e0594 conda-windows: new attempt at binutils 2020-06-22 12:33:36 +08:00
dd377e0459 wfvm: remove CMake
Better install via MSYS2 if needed.
2020-06-20 19:58:49 +08:00
ffed59ad95 wfvm: remove Visual Studio
Installer is a piece of trash and won't work reliably in command line.
2020-06-20 19:58:20 +08:00
8c8ede8387 wfvm: increase VM disk image size
Windows software is seriously bloated.
2020-06-20 19:52:22 +08:00
942c654af0 conda-windows: also enable on stable channel 2020-06-20 18:33:29 +08:00
77722ae68b wfvm: do not use virtio graphics (driver not installed) 2020-06-20 14:23:49 +08:00
8fa63fe916 commit missing file 2020-06-20 13:57:06 +08:00
561eb3a02e conda-windows: redistribute old packages 2020-06-20 13:56:15 +08:00
Your Name
5ef34eff97 conda-windows: work around more conda build dependency handling idiocy 2020-06-19 09:54:37 +08:00
0e4d2e3b54 conda-windows: fix name of conda package for VS activation 2020-06-18 19:06:23 +08:00
ae201e2aa8 wfvm: fix VS download 2020-06-18 18:50:01 +08:00
b30fa47e53 conda-windows: try to use conda package for VS activation 2020-06-18 18:48:54 +08:00
e589989955 wfvm: install Win8.1 SDK in VS 2020-06-18 18:19:46 +08:00
df38a58ae7 conda-windows: fix previous commit 2020-06-18 16:34:19 +08:00
eb4fa6ee15 conda-windows: fix llvm-or1k after 9479f297fc 2020-06-18 16:28:57 +08:00
7ff56838b6 conda-windows: build llvm with VS (WIP) 2020-06-18 16:22:05 +08:00
9479f297fc conda-windows: restrict to beta channel
Windoze is a truly horrible excuse for a OS and there have been lots of problems with those packages.
2020-06-18 16:05:20 +08:00
330636726c wfvm: downgrade visual studio to 2017
The conda garbage does not support later versions.
2020-06-18 15:34:55 +08:00
21f3b682c5 wfvm: get the visual studio installer to work
It is chock full of bugs and also the instructions on the microsoft website are wrong.
2020-06-18 14:16:56 +08:00
d64fcec76e wfvm: use absolute path for VS layout creation 2020-06-18 11:09:36 +08:00
f1325dce29 artiq-board.nix: move inputs outside inner function, accept vivado as arg to cut memory usage 2020-06-17 23:20:23 +02:00
08d28437e4 wfvm: new visual studio installation technique 2020-06-18 01:58:09 +08:00
1bf63a88ad wfvm: fix win-get of directory 2020-06-18 01:55:53 +08:00
6d2d0745e0 conda-windows: be more selective when copying conda packages 2020-06-18 00:10:57 +08:00
0e446db26e wfvm: fix win-get path problems 2020-06-18 00:10:33 +08:00
ab90fc88f6 wfvm: disable SSH host key warning messages 2020-06-17 23:42:22 +08:00
0f99ffc583 wfvm: use sftp instead of scp
scp is bogged down transferring the 13k files of the Visual Studio pile of garbage.
2020-06-17 23:40:49 +08:00
465cc193ec wfvm: add official cmake msi 2020-06-17 21:51:36 +08:00
a5b336f63c wfvm: add MSVC layer 2020-06-17 17:45:57 +08:00
aa76904361 wfvm: fix indentation 2020-06-17 17:08:35 +08:00
3d41477178 wfvm: support transferring folders recursively 2020-06-17 17:02:24 +08:00
dd688f7c11 conda: fix 40311dc33 2020-06-16 19:50:13 +08:00
5b5742c3f0 wfvm: upgrade Anaconda
The previous version craps out when installing sipyco from a channel (but not from a file, go figure.)
2020-06-16 19:46:50 +08:00
96ba1fab12 wfvm: autologin user
This makes manual testing of GUI applications easier.
2020-06-16 19:06:20 +08:00
40311dc33d conda: add numpy dependency to sipyco 2020-06-16 17:33:16 +08:00
dc8df8660a conda-windows: build llvmlite-artiq 2020-06-16 16:23:47 +08:00