|
|
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 |
|
|
|
20925a3d8d
|
conda-windows: build llvm-or1k
|
2020-06-16 15:32:48 +08:00 |
|
|
|
90150c7dbe
|
wfvm: install msys mingw make and cmake
|
2020-06-16 15:14:50 +08:00 |
|
|
|
d407eee013
|
wfvm: revert accidentally committed part of f464b61290
|
2020-06-16 14:49:16 +08:00 |
|
|
|
4272fe445c
|
conda-windows: clean up msys path
|
2020-06-16 14:05:47 +08:00 |
|
|
|
5be1c8aa4a
|
wfvm: make everything 64-bit
|
2020-06-16 13:29:40 +08:00 |
|
|
|
978ea89fe0
|
wfvm: install cmake in msys2 packages
|
2020-06-16 13:16:03 +08:00 |
|
|
|
f464b61290
|
conda-windows: fix binutils target handling
|
2020-06-16 12:52:42 +08:00 |
|
|
|
d75e222bfc
|
conda-windows: add libiconv dependency to binutils
|
2020-06-16 12:44:57 +08:00 |
|
|
|
448905f06e
|
conda-windows: do not include binutils source in recipe
Otherwise conda includes it in the final package and bloats it.
|
2020-06-15 20:20:40 +08:00 |
|
|
|
7e50d7de1c
|
conda-windows: build binutils via WFVM
|
2020-06-15 20:16:11 +08:00 |
|
|
|
5ab186e3dc
|
wfvm: allow network access in SSH demo
|
2020-06-15 20:16:11 +08:00 |
|
|
|
0ba8000660
|
wfvm: fix 'protocol error: filename does not match request' in win-get
|
2020-06-15 20:16:11 +08:00 |
|
|
|
38d7c89a8b
|
wfvm: fix QEMU not found in wfvm-run
|
2020-06-15 20:16:11 +08:00 |
|
|
|
72357a62f1
|
wfvm: make demo image more like default
|
2020-06-15 20:16:11 +08:00 |
|
|
|
dcb8e499df
|
wfvm: automate make_msys_packages.sh
|
2020-06-15 14:05:14 +08:00 |
|
|
|
107340b08a
|
wfvm: add win-get
|
2020-06-15 14:05:14 +08:00 |
|
|
|
ded12b51fd
|
wfvm: set default windows image parameters
|
2020-06-15 14:05:14 +08:00 |
|
|
|
cc37c8232d
|
wfvm: improve SSH use
|
2020-06-15 14:05:14 +08:00 |
|
|
|
876f278fdb
|
wfvm: use '-display none' instead of '-nographic'
|
2020-06-15 14:05:14 +08:00 |
|
|
|
4510ae7552
|
wfvm: reorganize, add demo-ssh
|
2020-06-15 00:29:01 +08:00 |
|
|
|
18f84a65c6
|
wfvm: remove unnecessary HOME
|
2020-06-15 00:29:01 +08:00 |
|
|
|
cc14162e60
|
wfvm: cleanup, move QEMU netdev settings out of defaults
|
2020-06-15 00:29:01 +08:00 |
|
|
|
a9830e0a51
|
wfvm: remove direnv file (accidentally committed?)
|
2020-06-14 21:59:38 +08:00 |
|
|
|
7c758967e0
|
wfvm: remove more dead code
|
2020-06-14 17:08:18 +08:00 |
|
|
|
996802257d
|
wfvm: clean up nix imports
|
2020-06-14 17:06:03 +08:00 |
|
|
|
446dbbfbf2
|
wfvm: remove more dead code
|
2020-06-14 17:05:28 +08:00 |
|
|
|
0a2e7dae93
|
wfvm: remove dead code
|
2020-06-14 16:57:59 +08:00 |
|
|
|
768d38db46
|
wfvm: remove installation 'settling' nonsense
Corruption was caused by the VM being killed instead of cleanly shut down.
|
2020-06-14 16:47:55 +08:00 |
|
|
|
aa0e0517c2
|
wfvm: wait for VM to terminate instead of killing it
|
2020-06-14 12:23:22 +08:00 |
|
|
|
10bb7df7ed
|
wfvm: reorganize
|
2020-06-14 12:23:22 +08:00 |
|
|
|
a808a5d090
|
wfvm: install MSYS compiler packages
|
2020-06-14 12:23:22 +08:00 |
|
|
|
088403cf6f
|
wfvm: remove duplicated SSH code
|
2020-06-13 18:57:50 +08:00 |
|
|
|
75c44b0369
|
wfvm: install MSYS2
|
2020-06-13 18:57:50 +08:00 |
|
|
|
72d155c047
|
wfvm: Use OpenSSH instead of Paramiko
The Paramiko hack does not stream stdout/stderr and makes debugging or using expect problematic.
|
2020-06-13 18:57:50 +08:00 |
|
|
|
22a8a5ed92
|
wfvm: let layers have build inputs
|
2020-06-13 18:57:50 +08:00 |
|
|
|
b8a7f84483
|
wfvm: avoid copying large anaconda installer file
|
2020-06-13 18:57:50 +08:00 |
|
|
|
40e8cc8407
|
add wfvm
|
2020-06-13 18:57:50 +08:00 |
|
|
|
98e6c29401
|
vivado: update to 2020.1
|
2020-06-11 13:23:15 +08:00 |
|
|
|
e15a0235a3
|
Revert "migen: add patch to limit vivado threads to 1"
This reverts commit 8f7308b036.
|
2020-06-11 08:18:02 +08:00 |
|
|
|
8f7308b036
|
migen: add patch to limit vivado threads to 1
|
2020-06-10 19:42:17 +02:00 |
|
|
|
dc2c495293
|
conda: update artiq dependencies
|
2020-06-10 21:46:36 +08:00 |
|
|
|
27c3940955
|
libartiq-support: no more build in lit.cfg
|
2020-06-10 17:16:01 +08:00 |
|
|
|
6313687278
|
remove artiq dependency on rustc
|
2020-06-10 17:09:43 +08:00 |
|
|
|
f1742db24f
|
conda: add llvmlite-artiq
|
2020-06-10 11:53:43 +08:00 |
|
|
|
c7fa00304b
|
conda: also show architecture-dependent packages in build products
|
2020-06-10 11:44:19 +08:00 |
|
|
|
649124a463
|
conda: add quamash
Closes #24
|
2020-06-10 11:43:41 +08:00 |
|
|
|
1f4639c7e4
|
conda: fix system shared libs not found in conda-build (#24)
|
2020-06-10 11:43:09 +08:00 |
|
|
|
0292090670
|
conda: include ARM support in llvm-or1k
|
2020-06-09 18:29:40 +08:00 |
|
|
|
20c2871896
|
conda: build llvm-or1k
|
2020-06-09 18:21:54 +08:00 |
|
|
|
9e900d321e
|
conda: add binutils.nix
|
2020-06-09 17:30:40 +08:00 |
|
|
|
e9c07a8985
|
conda: build binutils
|
2020-06-09 17:29:38 +08:00 |
|
|
|
37e70bbda1
|
conda: build asyncserial
|
2020-06-09 16:08:14 +08:00 |
|
|
|
68078d38d8
|
artiq: use nixpkgs levenshtein
|
2020-06-09 15:52:36 +08:00 |
|
|
|
f03d0370db
|
artiq: use nixpkgs quamash
|
2020-06-09 15:47:35 +08:00 |
|
|
|
7ab028deb6
|
conda: build pythonparser
|
2020-06-09 15:43:18 +08:00 |
|
|
|
0581ac7b69
|
conda: build bscan-spi-bitstreams
|
2020-06-09 15:29:18 +08:00 |
|
|
|
245b96a844
|
conda: remove unneeded PYTHON env var
|
2020-06-09 15:12:37 +08:00 |
|
|
|
456a21d363
|
conda: update system deps
List copied from nixpkgs.conda.
|
2020-06-09 15:12:11 +08:00 |
|
|
|
5d8ffd44ef
|
move conda files to dedicated folder
|
2020-06-09 14:30:23 +08:00 |
|
|
|
4b29022876
|
misoc: bump
|
2020-05-29 15:41:03 +08:00 |
|
|
|
db65504dab
|
migen: bump
|
2020-05-14 15:09:25 +08:00 |
|
|
|
95ccdcc5be
|
misoc: bump
|
2020-05-09 16:43:58 +08:00 |
|
|
|
43967e2324
|
migen: bump
|
2020-05-07 12:57:18 +08:00 |
|
|
|
aac80b9f84
|
misoc: bump
|
2020-04-23 23:07:42 +08:00 |
|
|
|
38a66c9d41
|
migen: bump
|
2020-04-23 23:05:59 +08:00 |
|
|
|
5dd966ceb0
|
remove pyftdi (upstream nixpkgs)
|
2020-04-20 17:49:45 +08:00 |
|
|
|
b13b90f661
|
migen: bump
|
2020-04-11 18:00:25 +08:00 |
|
|
|
61be83c730
|
migen-axi: bump
|
2020-04-10 17:50:41 +08:00 |
|
|
|
e8342cdf6b
|
misoc: bump
|
2020-04-10 17:50:34 +08:00 |
|
|
|
57891b5cae
|
migen-axi: fix compat with nixpkgs 19.09
|
2020-04-10 17:12:50 +08:00 |
|
|
|
438123f76e
|
migen-axi: bump
|
2020-04-10 15:47:39 +08:00 |
|
|
|
7d740fd464
|
lock cargo and cargo-vendor
With nixpkgs 20.03, the provided cargo package can no longer use the old rustc-or1k.
|
2020-04-04 13:02:18 +08:00 |
|
|
|
b0407a3775
|
migen: bump
|
2020-02-05 00:08:07 +08:00 |
|
|
|
9f5be63f8e
|
migen: bump
|
2020-02-04 17:43:27 +08:00 |
|
|
|
14fe3d5a56
|
revert accidentally committed part of beee821588
|
2020-01-21 13:55:18 +08:00 |
|
|
|
d11f13ce3a
|
jesd204: bump
|
2020-01-20 20:25:25 +08:00 |
|
|
|
7efd520ba5
|
jesd204: bump
|
2020-01-20 15:57:49 +08:00 |
|
|
|
4c6daeda64
|
migen: bump
|
2020-01-20 13:00:31 +08:00 |
|
|
|
369c167327
|
jesd204: bump
|
2020-01-20 12:50:10 +08:00 |
|
|
|
d26906d6d0
|
bump migen and misoc
|
2020-01-18 10:26:16 +08:00 |
|
|
|
f927de3280
|
openocd: use --disable-werror
Unbreaks build with recent GCC.
|
2020-01-06 12:33:30 +08:00 |
|
|
|
beee821588
|
nixops: update permissions
|
2020-01-06 10:53:45 +08:00 |
|
|
|
b817b63bcc
|
migen: bump
|
2019-12-20 15:21:44 +08:00 |
|
|
|
fbd2a521e1
|
Revert "windows tests: enable socat debug output"
This corrupted communication with the core device and caused analyzer tests to fail.
This reverts commit bdaf824f21.
|
2019-12-18 11:10:21 +08:00 |
|
