Commit Graph

56 Commits

Author SHA1 Message Date
84fc1375d1 s/stdenv.lib/lib/ 2021-03-11 17:32:26 +01:00
David Nadlinger
87fdb2c5ea Export qasync from artiq-fast
This makes it easier to pull in qasync from custom dev environments
(artiq-fast.qasync).
2021-01-29 14:29:22 +00:00
1c103ccb62 artiq-fast: move new artiq-board.nix to artiq-full/ 2020-12-23 15:31:14 +01: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
093b1b7224 artiq-fast: quamash -> qasync on artiq-6+ 2020-12-12 21:58:04 +08:00
eab83a6a3f artiq-fast: build gateware from a self-contained separate source derivation ()
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 .

Co-authored-by: Stephan Maka <stephan@spaceboyz.net>
Reviewed-on: 
2020-12-02 17:22:54 +08:00
b46f418176 add artiq-netboot package 2020-10-15 16:12:51 +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
7001d011fd update pythonparser patch for conda 2020-07-28 13:18:07 +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
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
8c508de922 artiq: add binutils-arm dependency for 6.0+ 2020-06-28 17:29:40 +08:00
e347cb7c4b conda-windows: use compiled llvm-or1k for llvmlite-artiq 2020-06-23 22:27:18 +08:00
69d8e02853 conda-windows: build llvmlite with VS, again 2020-06-23 19:48:53 +08:00
536d45012e conda-windows: build llvm with VS, second attempt 2020-06-23 16:24:59 +08:00
11dfff09b9 artiq-fast: fix a448d3bdc 2020-06-22 15:22:25 +08:00
a448d3bdc0 artiq-fast: organize 2020-06-22 15:13:02 +08:00
d895203b5b conda-windows: add binutils-arm again 2020-06-22 12:57:52 +08:00
b2e40e0594 conda-windows: new attempt at binutils 2020-06-22 12:33:36 +08:00
942c654af0 conda-windows: also enable on stable channel 2020-06-20 18:33:29 +08:00
561eb3a02e conda-windows: redistribute old packages 2020-06-20 13:56:15 +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
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
dd688f7c11 conda: fix 40311dc33 2020-06-16 19:50:13 +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
7e50d7de1c conda-windows: build binutils via WFVM 2020-06-15 20:16:11 +08:00
f1742db24f conda: add llvmlite-artiq 2020-06-10 11:53:43 +08:00
649124a463 conda: add quamash
Closes 
2020-06-10 11:43:41 +08:00
20c2871896 conda: build llvm-or1k 2020-06-09 18:21:54 +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
5d8ffd44ef move conda files to dedicated folder 2020-06-09 14:30:23 +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
14fe3d5a56 revert accidentally committed part of beee821588 2020-01-21 13:55:18 +08:00
beee821588 nixops: update permissions 2020-01-06 10:53:45 +08:00
9b0bead69b package sipyco and use for controllers 2019-11-07 19:34:36 +08:00
9b99ee9aad Revert "binutils-arm: armv7-unknown-linux-gnueabihf -> armv7-linux-gnueabihf"
rustc insists on -unknown.

This reverts commit d3c514ac7c.
2019-08-26 11:22:41 +08:00
d3c514ac7c binutils-arm: armv7-unknown-linux-gnueabihf -> armv7-linux-gnueabihf 2019-08-26 11:12:25 +08:00
5c64321fcc binutils-arm: use armv7-unknown-linux-gnueabihf target 2019-08-26 10:37:24 +08:00
aa30c7b539 add ARM binutils to the development environment (Zynq) 2019-08-25 09:27:12 +08:00