From e9c65abebe8ce6912479b0a7334a813ae581458b Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 15 Jan 2023 13:03:15 +0800
Subject: [PATCH] manual: fix Nix flakes installation. Closes #2036

---
 doc/manual/installing.rst | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
index 44b79c5d3..ef63f118a 100644
--- a/doc/manual/installing.rst
+++ b/doc/manual/installing.rst
@@ -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.inputs.artiq.follows = "artiq";
-    outputs = { self, artiq, extrapkg }:
+    outputs = { self, extrapkg }:
       let
-        pkgs = artiq.inputs.nixpkgs.legacyPackages.x86_64-linux;
-        aqmain = artiq.packages.x86_64-linux;
-        aqextra = extrapkg.packages.x86_64-linux;
+        pkgs = extrapkg.pkgs;
+        artiq = extrapkg.packages.x86_64-linux;
       in {
         defaultPackage.x86_64-linux = pkgs.buildEnv {
           name = "artiq-env";
@@ -41,9 +38,11 @@ Installing multiple packages and making them visible to the ARTIQ commands requi
             # ========================================
             (pkgs.python3.withPackages(ps: [
               # List desired Python packages here.
-              aqmain.artiq
+              artiq.artiq
               #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
               # interesting. Here are some examples:
@@ -58,11 +57,11 @@ Installing multiple packages and making them visible to the ARTIQ commands requi
               #ps.cirq
               #ps.qiskit
             ]))
-            #aqextra.korad_ka3005p
-            #aqextra.novatech409b
+            #artiq.korad_ka3005p
+            #artiq.novatech409b
             # List desired non-Python packages here
-            #aqmain.openocd-bscanspi  # needed if and only if flashing boards
-            # Other potentially interesting packages from the NixOS package collection:
+            #artiq.openocd-bscanspi  # needed if and only if flashing boards
+            # Other potentially interesting non-Python packages from the NixOS package collection:
             #pkgs.gtkwave
             #pkgs.spyder
             #pkgs.R