mwojcik
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,076 Commits 9 Branches 0 Tags 2.6 MiB
Commit Graph

94 Commits

Author SHA1 Message Date
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
Sebastien Bourdeauducq 093b1b7224 artiq-fast: quamash -> qasync on artiq-6+ 2020-12-12 21:58:04 +08: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 454c3d806c hack-patch pythonparser for python 3.8 2020-07-28 10:46:29 +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 e0a9253084 migen: bump 2020-07-11 09:50:42 +08:00
Sebastien Bourdeauducq 8c508de922 artiq: add binutils-arm dependency for 6.0+ 2020-06-28 17:29:40 +08:00
Sebastien Bourdeauducq 9733ec3509 llvm-or1k: bump 2020-06-23 21:18:37 +08:00
Sebastien Bourdeauducq e15a0235a3 Revert "migen: add patch to limit vivado threads to 1" 
This reverts commit 8f7308b036.
 2020-06-11 08:18:02 +08:00
Astro 8f7308b036 migen: add patch to limit vivado threads to 1 2020-06-10 19:42:17 +02:00
Sebastien Bourdeauducq 27c3940955 libartiq-support: no more build in lit.cfg 2020-06-10 17:16:01 +08:00
Sebastien Bourdeauducq 6313687278 remove artiq dependency on rustc 2020-06-10 17:09:43 +08:00
Sebastien Bourdeauducq f1742db24f conda: add llvmlite-artiq 2020-06-10 11:53:43 +08:00
Sebastien Bourdeauducq 20c2871896 conda: build llvm-or1k 2020-06-09 18:21:54 +08:00
Sebastien Bourdeauducq 37e70bbda1 conda: build asyncserial 2020-06-09 16:08:14 +08:00
Sebastien Bourdeauducq 68078d38d8 artiq: use nixpkgs levenshtein 2020-06-09 15:52:36 +08:00
Sebastien Bourdeauducq f03d0370db artiq: use nixpkgs quamash 2020-06-09 15:47:35 +08:00
Sebastien Bourdeauducq 7ab028deb6 conda: build pythonparser 2020-06-09 15:43:18 +08:00
Sebastien Bourdeauducq 4b29022876 misoc: bump 2020-05-29 15:41:03 +08:00
Sebastien Bourdeauducq db65504dab migen: bump 2020-05-14 15:09:25 +08:00
Sebastien Bourdeauducq 95ccdcc5be misoc: bump 2020-05-09 16:43:58 +08:00
Sebastien Bourdeauducq 43967e2324 migen: bump 2020-05-07 12:57:18 +08:00
Sebastien Bourdeauducq aac80b9f84 misoc: bump 2020-04-23 23:07:42 +08:00
Sebastien Bourdeauducq 38a66c9d41 migen: bump 2020-04-23 23:05:59 +08:00
Sebastien Bourdeauducq 5dd966ceb0 remove pyftdi (upstream nixpkgs) 2020-04-20 17:49:45 +08:00
Sebastien Bourdeauducq b13b90f661 migen: bump 2020-04-11 18:00:25 +08:00
Sebastien Bourdeauducq 61be83c730 migen-axi: bump 2020-04-10 17:50:41 +08:00
Sebastien Bourdeauducq e8342cdf6b misoc: bump 2020-04-10 17:50:34 +08:00
Sebastien Bourdeauducq 57891b5cae migen-axi: fix compat with nixpkgs 19.09 2020-04-10 17:12:50 +08:00
Sebastien Bourdeauducq 438123f76e migen-axi: bump 2020-04-10 15:47:39 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq b0407a3775 migen: bump 2020-02-05 00:08:07 +08:00
Sebastien Bourdeauducq 9f5be63f8e migen: bump 2020-02-04 17:43:27 +08:00
Sebastien Bourdeauducq d11f13ce3a jesd204: bump 2020-01-20 20:25:25 +08:00