occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

manual: fix Nix flakes installation. Closes #2036

This commit is contained in:
Sebastien Bourdeauducq 2023-01-15 13:03:15 +08:00
parent 20e8f17b3d
commit e9c65abebe
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/manual/installing.rst
View File

@ -24,14 +24,11 @@ Installing multiple packages and making them visible to the ARTIQ commands requi
:: ::
{ {
inputs.artiq.url = "git+https://github.com/m-labs/artiq.git";
inputs.extrapkg.url = "git+https://git.m-labs.hk/M-Labs/artiq-extrapkg.git"; inputs.extrapkg.url = "git+https://git.m-labs.hk/M-Labs/artiq-extrapkg.git";
inputs.extrapkg.inputs.artiq.follows = "artiq"; outputs = { self, extrapkg }:
outputs = { self, artiq, extrapkg }:
let let
pkgs = artiq.inputs.nixpkgs.legacyPackages.x86_64-linux; pkgs = extrapkg.pkgs;
aqmain = artiq.packages.x86_64-linux; artiq = extrapkg.packages.x86_64-linux;
aqextra = extrapkg.packages.x86_64-linux;
in { in {
defaultPackage.x86_64-linux = pkgs.buildEnv { defaultPackage.x86_64-linux = pkgs.buildEnv {
name = "artiq-env"; name = "artiq-env";
@ -41,9 +38,11 @@ Installing multiple packages and making them visible to the ARTIQ commands requi
# ======================================== # ========================================
(pkgs.python3.withPackages(ps: [ (pkgs.python3.withPackages(ps: [
# List desired Python packages here. # List desired Python packages here.
aqmain.artiq artiq.artiq
#ps.paramiko # needed if and only if flashing boards remotely (artiq_flash -H) #ps.paramiko # needed if and only if flashing boards remotely (artiq_flash -H)
#aqextra.flake8-artiq #artiq.flake8-artiq
#artiq.dax
#artiq.dax-applets
# The NixOS package collection contains many other packages that you may find # The NixOS package collection contains many other packages that you may find
# interesting. Here are some examples: # interesting. Here are some examples:
@ -58,11 +57,11 @@ Installing multiple packages and making them visible to the ARTIQ commands requi
#ps.cirq #ps.cirq
#ps.qiskit #ps.qiskit
])) ]))
#aqextra.korad_ka3005p #artiq.korad_ka3005p
#aqextra.novatech409b #artiq.novatech409b
# List desired non-Python packages here # List desired non-Python packages here
#aqmain.openocd-bscanspi # needed if and only if flashing boards #artiq.openocd-bscanspi # needed if and only if flashing boards
# Other potentially interesting packages from the NixOS package collection: # Other potentially interesting non-Python packages from the NixOS package collection:
#pkgs.gtkwave #pkgs.gtkwave
#pkgs.spyder #pkgs.spyder
#pkgs.R #pkgs.R