M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity
1,238 Commits 1 Branch 0 Tags 2.8 MiB
Commit Graph

305 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq a45b6fc771 misoc: bump 2020-12-22 23:46:51 +08:00
Sebastien Bourdeauducq 2814292f05 jesd204: bump 2020-12-19 17:04:59 +08: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
Drew Risinger beb99234fe conda build: allow pname or name convention 2020-12-17 14:16:45 +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
Astro 00352b9942 artiq-board, artiq-board-legacy: dontFixup board packages 
resolves gitea issue #35
 2020-12-02 17:07:19 +01:00
Astro 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: #23
 2020-12-02 17:22:54 +08:00
Astro 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
Astro 5695977531 Revert "artiq-board.nix: move compilers into nativeBuildInputs" 
This reverts commit fd25af0733.
 2020-11-25 21:23:03 +01:00
Astro 2e62831998 Revert "artiq-fast: add strictDeps=true to fetchcargo.nix" 
This reverts commit 843da12452.
 2020-11-25 21:23:02 +01:00
Astro fd25af0733 artiq-board.nix: move compilers into nativeBuildInputs 
Part of Gitea issue #34
 2020-11-25 18:19:03 +01:00
Astro 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
Astro 571cfbd8a6 python-deps: bump migen, migen-axi 2020-11-12 15:43:17 +01:00
Sebastien Bourdeauducq 0a11450df3 migen: bump 2020-11-06 12:32:51 +08:00
Sebastien Bourdeauducq 30629929a8 migen: bump 2020-11-06 12:25:21 +08:00
Sebastien Bourdeauducq b46f418176 add artiq-netboot package 2020-10-15 16:12:51 +08:00
Sebastien Bourdeauducq 24510c81d6 python-deps: update migen-axi 2020-10-14 20:30:59 +08:00
Sebastien Bourdeauducq ee9983728e update migen+misoc 2020-10-12 22:33:40 +08:00
Sebastien Bourdeauducq 5ba0896be6 migen: bump 2020-09-17 16:39:38 +08:00
Sebastien Bourdeauducq 1c43932205 cleanup/fix python-deps import 2020-08-01 10:40:00 +08:00
Sebastien Bourdeauducq 60e554c501 artiq: use new misoc for artiq-6 2020-08-01 10:31:07 +08:00
Sebastien Bourdeauducq 7b27d68841 artiq: apply Qt wrapper to artiq_session 2020-08-01 10:20:15 +08:00
Sebastien Bourdeauducq 3c463f7397 artiq-board: mention asm/llvm_asm 2020-07-29 13:38:53 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 7001d011fd update pythonparser patch for conda 2020-07-28 13:18:07 +08:00
Sebastien Bourdeauducq 454c3d806c hack-patch pythonparser for python 3.8 2020-07-28 10:46:29 +08:00
Sebastien Bourdeauducq 4ef1b6e76d artiq-board: disable timing check 2020-07-26 23:51:19 +08:00
Astro be5787ab55 conda-windows/binutils-recipe: change to --build=x86_64-w64-mingw32 
Fixes Gitea issue #28
 2020-07-24 10:01:37 +08:00
Astro bc447638a9 Revert "conda-windows-binutils-or1k: build with msys2, not conda" 
This reverts commit 3409eb3c11.
 2020-07-24 09:35:29 +08:00
Astro 7f32f8e438 Revert "conda-windows-binutils-arm: likewise" 
This reverts commit 1d7b1e9175.
 2020-07-24 09:35:06 +08:00
Astro 89d700a796 windows/binutils: change to --build=x86_64-w64-mingw32 2020-07-24 09:33:49 +08:00
Astro 1d7b1e9175 conda-windows-binutils-arm: likewise 2020-07-22 08:24:37 +08:00
Astro 3409eb3c11 conda-windows-binutils-or1k: build with msys2, not conda 2020-07-22 06:43:56 +08:00
Sebastien Bourdeauducq 6c328f32f1 migen-axi: bump 2020-07-19 14:04:50 +08:00
Sebastien Bourdeauducq e75d16f55a artiq: fix use of Qt 2020-07-17 11:48:43 +08:00
Sebastien Bourdeauducq cc00cfc1a8 wfvm: bump 2020-07-14 15:28:00 +08:00
Sebastien Bourdeauducq 888481c0ce typo 2020-07-12 23:20:31 +08:00
Sebastien Bourdeauducq cc5694dedf artiq-board: allow setting src 2020-07-12 23:19:40 +08:00
Sebastien Bourdeauducq e0a9253084 migen: bump 2020-07-11 09:50:42 +08:00
Astro fe8417e229 windows: add a doc note to make_conda_packages.sh 2020-07-10 00:49:56 +02:00
Astro 088a101d89 windows: doc make_conda_packages.sh 2020-07-01 17:56:52 +02:00
Sebastien Bourdeauducq 8c508de922 artiq: add binutils-arm dependency for 6.0+ 2020-06-28 17:29:40 +08:00
Sebastien Bourdeauducq 48bc991c7c move wfvm.nix into artiq-fast 
Avoids issue with generatedNix
 2020-06-28 14:50:44 +08:00
Sebastien Bourdeauducq 4cd7a559e8 use external WFVM, pin WFVM nixpkgs 2020-06-28 14:46:32 +08:00
Sebastien Bourdeauducq 005792ed77 wfvm: restrict distribution of VS layout 2020-06-28 13:56:43 +08:00
Sebastien Bourdeauducq 64224a0b51 wfvm: cleanup 2020-06-28 13:56:28 +08:00
Sebastien Bourdeauducq 6eecb5085d wfvm: move out MSYS2 package list 2020-06-27 17:22:34 +08:00
Sebastien Bourdeauducq 486b343b15 windows: update conda dependencies for beta test 2020-06-27 17:06:55 +08:00
Astro 30f205680f wfvm: add RESTRICTDIST- to names of nonfree output paths 
Preparation for #26
 2020-06-26 20:48:34 +02:00
Astro c00c10e223 artiq-board: fix and simplify check for timing criteria 
Re-fixes Gitea issue #15
 2020-06-25 00:21:48 +02:00
Sebastien Bourdeauducq e87d2b4ecd windows: add back test timeout 2020-06-24 22:28:16 +08:00
Sebastien Bourdeauducq d809926d10 conda-windows: try fixing llvmlite-artiq setup.py install 2020-06-24 22:22:00 +08:00
Sebastien Bourdeauducq e347cb7c4b conda-windows: use compiled llvm-or1k for llvmlite-artiq 2020-06-23 22:27:18 +08:00
Sebastien Bourdeauducq 9733ec3509 llvm-or1k: bump 2020-06-23 21:18:37 +08:00
Sebastien Bourdeauducq ed313133b8 conda-windows: fix llvm-or1k yaml syntax 2020-06-23 19:49:28 +08:00
Sebastien Bourdeauducq 69d8e02853 conda-windows: build llvmlite with VS, again 2020-06-23 19:48:53 +08:00
Sebastien Bourdeauducq 80bf1d300e wfvm: cleanup 2020-06-23 19:06:53 +08:00
Sebastien Bourdeauducq 536d45012e conda-windows: build llvm with VS, second attempt 2020-06-23 16:24:59 +08:00
Sebastien Bourdeauducq 4158527dba wfvm: add back MSVC 2020-06-23 16:24:59 +08:00
Sebastien Bourdeauducq 8111b2f42b windows: run tests using WFVM 2020-06-22 17:45:18 +08:00
Sebastien Bourdeauducq 1b79bdaa20 wfvm: set -e in scripts 2020-06-22 17:24:53 +08:00
Sebastien Bourdeauducq 7ca6ada7ee conda-windows: do not set msys path twice in binutils 2020-06-22 16:53:40 +08:00
Sebastien Bourdeauducq 3766781a24 windows: do not use idiotic .conda files 2020-06-22 16:48:11 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 11dfff09b9 artiq-fast: fix a448d3bdc 2020-06-22 15:22:25 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq a448d3bdc0 artiq-fast: organize 2020-06-22 15:13:02 +08:00
Sebastien Bourdeauducq 05cde854dd windows: add script to automatically download conda dependencies and create fetchurl nix files 2020-06-22 14:56:02 +08:00
Sebastien Bourdeauducq bd8fa5d955 wfvm: support disabling fake RTC 
Avoids SSL 'certificate not yet valid' errors.
 2020-06-22 14:43:02 +08:00
Sebastien Bourdeauducq d895203b5b conda-windows: add binutils-arm again 2020-06-22 12:57:52 +08:00
Sebastien Bourdeauducq 7838d6e683 conda-windows: make binutils generic 2020-06-22 12:57:29 +08:00
Sebastien Bourdeauducq b2e40e0594 conda-windows: new attempt at binutils 2020-06-22 12:33:36 +08:00
Sebastien Bourdeauducq dd377e0459 wfvm: remove CMake 
Better install via MSYS2 if needed.
 2020-06-20 19:58:49 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 8c8ede8387 wfvm: increase VM disk image size 
Windows software is seriously bloated.
 2020-06-20 19:52:22 +08:00
Sebastien Bourdeauducq 942c654af0 conda-windows: also enable on stable channel 2020-06-20 18:33:29 +08:00
Sebastien Bourdeauducq 77722ae68b wfvm: do not use virtio graphics (driver not installed) 2020-06-20 14:23:49 +08:00
Sebastien Bourdeauducq 8fa63fe916 commit missing file 2020-06-20 13:57:06 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 0e4d2e3b54 conda-windows: fix name of conda package for VS activation 2020-06-18 19:06:23 +08:00
Sebastien Bourdeauducq ae201e2aa8 wfvm: fix VS download 2020-06-18 18:50:01 +08:00
Sebastien Bourdeauducq b30fa47e53 conda-windows: try to use conda package for VS activation 2020-06-18 18:48:54 +08:00
Sebastien Bourdeauducq e589989955 wfvm: install Win8.1 SDK in VS 2020-06-18 18:19:46 +08:00
Sebastien Bourdeauducq df38a58ae7 conda-windows: fix previous commit 2020-06-18 16:34:19 +08:00
Sebastien Bourdeauducq eb4fa6ee15 conda-windows: fix llvm-or1k after 9479f297fc 2020-06-18 16:28:57 +08:00
Sebastien Bourdeauducq 7ff56838b6 conda-windows: build llvm with VS (WIP) 2020-06-18 16:22:05 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 330636726c wfvm: downgrade visual studio to 2017 
The conda garbage does not support later versions.
 2020-06-18 15:34:55 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq d64fcec76e wfvm: use absolute path for VS layout creation 2020-06-18 11:09:36 +08:00
Astro 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
Sebastien Bourdeauducq 08d28437e4 wfvm: new visual studio installation technique 2020-06-18 01:58:09 +08:00
Sebastien Bourdeauducq 1bf63a88ad wfvm: fix win-get of directory 2020-06-18 01:55:53 +08:00
Sebastien Bourdeauducq 6d2d0745e0 conda-windows: be more selective when copying conda packages 2020-06-18 00:10:57 +08:00