artiq-board-generated/artiq-board.nix

@@ -1,97 +0,0 @@
-# Install Vivado in /opt and add to /etc/nixos/configuration.nix:
-#  nix.sandboxPaths = ["/opt"];
-
-{ pkgs ? import <nixpkgs> {}
-, artiq-fast
-}:
-
-let
-  artiqSrc = import (artiq-fast + "/pkgs/artiq-src.nix") { fetchgit = pkgs.fetchgit; };
-  artiqpkgs = import artiq-fast { inherit pkgs; };
-  pythonEnv = pkgs.python3.withPackages (ps: with ps; [
-    jinja2 jsonschema numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
-  ]);
-  fetchcargo = import (artiq-fast + "/fetchcargo.nix") {
-    inherit (pkgs) stdenv lib cacert git;
-    inherit (artiqpkgs) cargo cargo-vendor;
-  };
-  cargoDeps = fetchcargo rec {
-    name = "artiq-firmware-cargo-deps";
-    src = "${artiqSrc}/artiq/firmware";
-    sha256 = import (artiqSrc + "/artiq/firmware/cargosha256.nix");
-  };
-
-  cargoVendored = pkgs.stdenv.mkDerivation {
-    name = "artiq-firmware-cargo-vendored";
-    src = cargoDeps;
-    phases = [ "unpackPhase" "installPhase" ];
-    installPhase =
-      ''
-      mkdir -p $out/registry
-      cat << EOF > $out/config
-        [source.crates-io]
-        registry = "https://github.com/rust-lang/crates.io-index"
-        replace-with = "vendored-sources"
-
-        [source."https://github.com/m-labs/libfringe"]
-        git = "https://github.com/m-labs/libfringe"
-        rev = "b8a6d8f"
-        replace-with = "vendored-sources"
-
-        [source.vendored-sources]
-        directory = "$out/registry"
-      EOF
-      cp -R * $out/registry
-      '';
-  };
-in
-{ target
-, variant
-, src ? null
-, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
-, extraInstallCommands ? ""
-, ...
-}:
-let
-  name = "artiq-board-${target}-${variant}-${artiqpkgs.artiq.version}-xxx";
-  installPath = "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
-in
-# Board packages are Python modules so that they get added to the ARTIQ Python
-# environment, and artiq_flash finds them.
-pkgs.stdenv.mkDerivation {
-  name = "artiq-board-${target}-${variant}-${artiqpkgs.artiq.version}";
-  inherit src;
-  phases = [ "buildPhase" "installPhase" ];
-  nativeBuildInputs = [
-    pkgs.gnumake pkgs.which pythonEnv
-    artiqpkgs.cargo
-    artiqpkgs.rustc
-    artiqpkgs.binutils-or1k
-    artiqpkgs.llvm-or1k
-  ];
-  buildInputs = [ pythonEnv ];
-  buildPhase =
-    ''
-    export CARGO_HOME=${cargoVendored}
-    export TARGET_AR=or1k-linux-ar
-    ${buildCommand} --no-compile-gateware --gateware-identifier-str=unprogrammed
-    '';
-  installPhase =
-    ''
-    mkdir -p $out
-    cp -ar artiq_${target}/${variant}/gateware $out
-
-    TARGET_DIR=$out/${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}
-    mkdir -p $TARGET_DIR
-    if [ -e artiq_${target}/${variant}/software/bootloader/bootloader.bin ]
-    then cp artiq_${target}/${variant}/software/bootloader/bootloader.bin $TARGET_DIR
-    fi
-    if [ -e artiq_${target}/${variant}/software/runtime ]
-    then cp artiq_${target}/${variant}/software/runtime/runtime.{elf,fbi} $TARGET_DIR
-    else cp artiq_${target}/${variant}/software/satman/satman.{elf,fbi} $TARGET_DIR
-    fi
-    ${extraInstallCommands}
-    '';
-  # don't mangle ELF files as they are not for NixOS
-  dontFixup = true;
-}

artiq-board-generated/default.nix

@@ -1,54 +0,0 @@
-{ pkgs ? import <nixpkgs> {}
-, artiq-fast ? <artiq-fast>
-}:
-
-let
-  sinaraSystemsSrc = <sinaraSystemsSrc>;
-  generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
-    ''
-    mkdir $out
-    cp ${./artiq-board.nix} $out/artiq-board.nix
-    cp ${../artiq-full/artiq-targets.nix} $out/artiq-targets.nix
-    cp -a ${artiq-fast} $out/fast
-
-    REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
-    echo -n $REV > $out/sinara-rev.txt
-    SINARA_SRC_CLEAN=`mktemp -d`
-    cp -a ${sinaraSystemsSrc}/. $SINARA_SRC_CLEAN
-    chmod -R 755 $SINARA_SRC_CLEAN/.git
-    chmod 755 $SINARA_SRC_CLEAN
-    rm -rf $SINARA_SRC_CLEAN/.git
-    HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
-    echo -n $HASH > $out/sinara-hash.txt
-
-    cat > $out/default.nix << EOF
-    { pkgs ? import <nixpkgs> {}
-    }:
-
-    let
-      sinaraSystemsSrc = pkgs.fetchgit {
-        url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
-        rev = "$REV";
-        sha256 = "$HASH";
-      };
-      artiq-fast = import ./fast { inherit pkgs; };
-      artiq-board = import ./artiq-board.nix {
-        inherit pkgs;
-        artiq-fast = ./fast;
-      };
-    in
-      builtins.mapAttrs (_: conf: pkgs.lib.hydraJob (artiq-board conf)) (
-        import ./artiq-targets.nix {
-          inherit pkgs sinaraSystemsSrc;
-          artiqVersion = artiq-fast.artiq.version;
-        }
-      )
-    EOF
-    '';
-  artiq-board-generated = import generatedNix {
-    inherit pkgs;
-  };
-in
-artiq-board-generated // {
-  generated-nix = pkgs.lib.hydraJob generatedNix;
-}

artiq-fast.nix

@@ -75,7 +75,7 @@ in
       mkdir $HOME/.ssh
       cp /opt/hydra_id_rsa $HOME/.ssh/id_rsa
       cp /opt/hydra_id_rsa.pub $HOME/.ssh/id_rsa.pub
-      echo "rpi-1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPOBQVcsvk6WgRj18v4m0zkFeKrcN9gA+r6sxQxNwFpv" > $HOME/.ssh/known_hosts
+      echo "rpi-1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMc7waNkP2HjL5Eo94evoxJhC8CbYj4i2n1THe5TPIR3" > $HOME/.ssh/known_hosts
       chmod 600 $HOME/.ssh/id_rsa
       LOCKCTL=$(mktemp -d)
       mkfifo $LOCKCTL/lockctl
@@ -84,7 +84,7 @@ in
         -i $HOME/.ssh/id_rsa \
         -o UserKnownHostsFile=$HOME/.ssh/known_hosts \
         sb@rpi-1 \
-        'mkdir -p /tmp/board_lock && flock /tmp/board_lock/kc705-1 -c "echo Ok; cat"' \
+        'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' \
       | (
         # End remote flock via FIFO
         atexit_unlock() {

artiq-fast/artiq-board.nix

@@ -9,7 +9,7 @@ let
   artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
   artiqpkgs = import ./default.nix { inherit pkgs; };
   fetchcargo = import ./fetchcargo.nix {
-    inherit (pkgs) stdenv lib cacert git;
+    inherit (pkgs) stdenv cacert git;
     inherit (artiqpkgs) cargo cargo-vendor;
   };
   cargoDeps = fetchcargo rec {
@@ -45,36 +45,31 @@ let
 in
 { target
 , variant
-, src ? null
 , buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
-, extraInstallCommands ? ""
+, extraInstallCommands ? ""}:
-, ... }:
 
 # Board packages are Python modules so that they get added to the ARTIQ Python
 # environment, and artiq_flash finds them.
 pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
   name = "artiq-board-${target}-${variant}-${version}";
   version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
-  inherit src;
   phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
-  nativeBuildInputs = [
+  buildInputs = [
     vivado
     pkgs.gnumake
+    (pkgs.python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ]))
     artiqpkgs.cargo
     artiqpkgs.rustc
     artiqpkgs.binutils-or1k
     artiqpkgs.llvm-or1k
   ];
-  buildInputs = [ (pkgs.python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ])) ];
   buildPhase = 
     ''
     export CARGO_HOME=${cargoVendored}
     export TARGET_AR=or1k-linux-ar
     ${buildCommand}
     '';
-  # temporarily disabled because there is currently always at least one Kasli bitstream
+  doCheck = true;
-  # that fails timing and blocks the conda channel.
-  doCheck = false;
   checkPhase = ''
     # Search for PCREs in the Vivado output to check for errors
     check_log() {
@@ -97,6 +92,4 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
     fi
     ${extraInstallCommands}
     '';
-  # don't mangle ELF files as they are not for NixOS
-  dontFixup = true;
 })

artiq-fast/conda-windows/binutils-recipe/bld.bat

@@ -1,5 +1,5 @@
 set MSYS=C:\MSYS64
-set TRIPLE=x86_64-w64-mingw32
+set TRIPLE=x86_64-pc-mingw64
 set PATH=%MSYS%\usr\bin;%MSYS%\mingw64\bin;%PATH%
 
 mkdir build

artiq-fast/conda-windows/llvmlite-artiq.nix

@@ -36,8 +36,6 @@ let
         build:
           - cmake
           - llvm-or1k
-        run:
-          - python<3.9
       EOF
 
       cat > bld.bat << EOF

artiq-fast/conda/artiq-deps.nix

@@ -0,0 +1,16 @@
+[
+  "llvmlite-artiq"
+  "binutils-or1k-linux"
+  "pythonparser"
+  "scipy"
+  "numpy"
+  "prettytable"
+  "h5py"
+  "python-dateutil"
+  "pyqt"
+  "quamash"
+  "pyqtgraph"
+  "pygit2"
+  "python-levenshtein"
+  "sipyco"
+]

artiq-fast/conda/artiq.nix

@@ -6,22 +6,7 @@ let
     name = "artiq";
     inherit version;
     src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
-    dependencies = [
+    dependencies = import ./artiq-deps.nix;
-      "llvmlite-artiq"
-      "binutils-or1k-linux"
-      "pythonparser"
-      "scipy"
-      "numpy"
-      "prettytable"
-      "h5py"
-      "python-dateutil"
-      "pyqt"
-      (if (pkgs.lib.strings.versionAtLeast version "6.0") then "qasync" else "quamash")
-      "pyqtgraph"
-      "pygit2"
-      "python-levenshtein"
-      "sipyco"
-    ];
     extraYaml =
     ''
     about:

artiq-fast/conda/bscan-spi-bitstreams.nix

@@ -6,7 +6,7 @@ let
     mkdir -p $out/fake-conda;
 
     # work around yet more idiotic conda behavior - build breaks if write permissions aren't set on source files.
-    cp --no-preserve=mode,ownership -L -R ${bscan_spi_bitstreams} workaround-conda
+    cp --no-preserve=mode,ownership -R ${bscan_spi_bitstreams} workaround-conda
     pushd workaround-conda
     tar cf $out/src.tar .
     popd

artiq-fast/conda/build.nix

@@ -2,22 +2,12 @@
 # recipe must be a string pointing to a path within the source.
 
 { pkgs }:
-{ name ? null
+{ name, src, recipe ? "fake-conda"}:
-, src
-, pname ? null
-, version ? null
-, recipe ? "fake-conda"
-}:
 
-# Check that either name is specified or both pname & version are specified.
-assert (name == null) -> pname != null && version != null;
-assert (name != null) -> pname == null && version == null;
 let
   condaBuilderEnv = import ./builder-env.nix { inherit pkgs; };
-  realName = if (name != null) then name else "${pname}-${version}";
 in pkgs.stdenv.mkDerivation {
-  name = realName;
+  inherit name src;
-  inherit src;
   buildCommand =
     ''
     HOME=`pwd`

artiq-fast/conda/builder-env.nix

@@ -3,21 +3,14 @@
 with pkgs;
 
 let
-  condaDeps = [ stdenv.cc zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
+  condaDeps = [ stdenv.cc xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
   # Use the full Anaconda distribution, which already contains conda-build and its many dependencies,
   # so we don't have to manually deal with them.
   condaInstaller = fetchurl {
-    url = "https://repo.anaconda.com/archive/Anaconda3-2021.05-Linux-x86_64.sh";
+    url = "https://repo.anaconda.com/archive/Anaconda3-2019.03-Linux-x86_64.sh";
-    sha256 = "0lrxwd3pwz8k3jxwgkd9x47wgkqqy9s8m7hgx1x2gw4gcwysnl97";
+    sha256 = "0fmpdd5876ylds98mydmv5klnwlzasa461k0l1f4vhbw96vm3j25";
   };
-  condaSrcChmod = runCommand "conda-src-chmod" { }
+  condaSrcChmod = runCommand "conda-src-chmod" { } "mkdir $out; cp ${condaInstaller} $out/conda-installer.sh; chmod +x $out/conda-installer.sh";
-    ''
-    mkdir $out
-    cp ${condaInstaller} $out/conda-installer.sh
-    chmod +x $out/conda-installer.sh
-    # keep the same file length to avoid breaking embedded payload offsets
-    sed -i 0,/unset\ LD_LIBRARY_PATH/s//\#nset\ LD_LIBRARY_PATH/ $out/conda-installer.sh
-    '';
   condaInstallerEnv = buildFHSUserEnv {
     name = "conda-installer-env";
     targetPkgs = pkgs: ([ condaSrcChmod ] ++ condaDeps);
@@ -33,7 +26,7 @@ let
   condaInstalled = runCommand "conda-installed" { }
     ''
     ${condaInstallerEnv}/bin/conda-installer-env -c "${condaSrcChmod}/conda-installer.sh -p $out -b"
-    substituteInPlace $out/lib/python3.8/site-packages/conda/gateways/disk/__init__.py \
+    substituteInPlace $out/lib/python3.7/site-packages/conda/gateways/disk/__init__.py \
       --replace "os.chmod(path, 0o2775)" "pass"
 
     # The conda garbage breaks if the package filename is prefixed with the Nix store hash.

artiq-fast/conda/llvmlite-artiq.nix

@@ -25,7 +25,7 @@ let
     # that they are not there if they have been installed from files.
     requirements:
       run:
-        - python<3.9
+        - python
         - ncurses [linux]
     EOF
 

artiq-fast/default.nix

@@ -1,9 +1,7 @@
 { pkgs ? import <nixpkgs> {}}:
 with pkgs;
 let
-  artiq6 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0";
+  pythonDeps = import ./pkgs/python-deps.nix { inherit (pkgs) stdenv fetchFromGitHub python3Packages; };
-  artiq7 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "7.0";
-  pythonDeps = import ./pkgs/python-deps.nix { inherit (pkgs) lib fetchgit fetchFromGitHub python3Packages; misoc-new = artiq7; };
 
   boards = [
     { target = "kasli"; variant = "tester"; }
@@ -21,38 +19,36 @@ let
       }) {} boards;
 
   mainPackages = rec {
-    inherit (pythonDeps) sipyco asyncserial pythonparser pyqtgraph-qt5 artiq-netboot misoc migen microscope jesd204b migen-axi lit outputcheck qasync;
+    inherit (pythonDeps) sipyco asyncserial pythonparser pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
     binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
     binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
     llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
     rustc = callPackage ./pkgs/rust/rustc-with-crates.nix
-      ((lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+      ((stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
          stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
        }) //
        { inherit llvm-or1k; });
-    cargo = callPackage ./pkgs/rust/cargo.nix { inherit rustc; rustPlatform = rustPackages_1_45.rustPlatform; };
+    cargo = callPackage ./pkgs/rust/cargo.nix { inherit rustc; };
     cargo-vendor = callPackage ./pkgs/rust/cargo-vendor.nix {};
     llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
     libartiq-support = callPackage ./pkgs/libartiq-support.nix { inherit rustc; };
-    artiq = callPackage ./pkgs/artiq.nix { inherit pythonDeps binutils-or1k binutils-arm llvm-or1k llvmlite-artiq libartiq-support lit outputcheck; };
+    artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k binutils-arm llvm-or1k llvmlite-artiq libartiq-support lit outputcheck; };
     artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
-    openocd = callPackage ./pkgs/openocd.nix { };
+    openocd = callPackage ./pkgs/openocd.nix {};
   };
 
   condaNoarch = {
     conda-pythonparser = import ./conda/build.nix { inherit pkgs; } {
-      pname = "conda-pythonparser";
+      name = "conda-pythonparser";
-      inherit (pythonDeps.pythonparser) version;
       src = import ./conda/fake-source.nix { inherit pkgs; } {
         name = "pythonparser";
         inherit (pythonDeps.pythonparser) version src;
-        extraSrcCommands = "patch -p1 < ${./pkgs/pythonparserver.patch}";
+        extraSrcCommands = "patch -p1 < ${./pkgs/python37hack.patch}";
         dependencies = ["regex"];
       };
     };
     conda-sipyco = import ./conda/build.nix { inherit pkgs; } {
-      pname = "conda-sipyco";
+      name = "conda-sipyco";
-      inherit (pythonDeps.sipyco) version;
       src = import ./conda/fake-source.nix { inherit pkgs; } {
         name = "sipyco";
         inherit (pythonDeps.sipyco) version src;
@@ -60,29 +56,19 @@ let
       };
     };
     conda-quamash = import ./conda/build.nix { inherit pkgs; } {
-      pname = "conda-quamash";
+      name = "conda-quamash";
-      inherit (pkgs.python3Packages.quamash) version;
       src = import ./conda/fake-source.nix { inherit pkgs; } {
         name = "quamash";
         inherit (pkgs.python3Packages.quamash) version src;
       };
     };
-    conda-qasync = import ./conda/build.nix { inherit pkgs; } {
-      pname = "conda-qasync";
-      inherit (pythonDeps.qasync) version;
-      src = import ./conda/fake-source.nix { inherit pkgs; } {
-        name = "qasync";
-        inherit (pythonDeps.qasync) version src;
-      };
-    };
     conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
       inherit pkgs;
-      bscan_spi_bitstreams = "${mainPackages.openocd}/share/bscan-spi-bitstreams";
+      inherit (mainPackages.openocd) bscan_spi_bitstreams;
     };
     conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
     conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {
-      pname = "conda-asyncserial";
+      name = "conda-asyncserial";
-      inherit (pythonDeps.asyncserial) version;
       src = import ./conda/fake-source.nix { inherit pkgs; } {
         name = "asyncserial";
         inherit (pythonDeps.asyncserial) version src;
@@ -159,6 +145,6 @@ let
     };
   };
 
-  condaWindows = if artiq6 then condaWindowsExperimental else condaWindowsLegacy;
+  condaWindows = if (pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0") then condaWindowsExperimental else condaWindowsLegacy;
 in
   boardPackages // mainPackages // condaNoarch // condaLinux // condaWindows

artiq-fast/fetchcargo.nix

@@ -1,8 +1,7 @@
-{ stdenv, lib, cacert, git, cargo, cargo-vendor }:
+{ stdenv, cacert, git, cargo, cargo-vendor }:
 { name, src, sha256 }:
 stdenv.mkDerivation {
   name = "${name}-vendor";
-  strictDeps = true;
   nativeBuildInputs = [ cacert git cargo cargo-vendor ];
   inherit src;
 
@@ -31,6 +30,6 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
   preferLocalBuild = true;
 }

artiq-fast/pkgs/artiq.nix

@@ -1,33 +1,17 @@
-{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck, fontconfig }:
+{ stdenv, lib, callPackage, fetchgit, git, python3Packages, qt5Full, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
 
-python3Packages.buildPythonPackage rec {
+let
-  pname = "artiq";
+  pythonDeps = callPackage ./python-deps.nix {};
+in
+  python3Packages.buildPythonPackage rec {
+    name = "artiq-${version}";
     version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
     src = import ./artiq-src.nix { inherit fetchgit; };
-
     preBuild = "export VERSIONEER_OVERRIDE=${version}";
-
+    propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
-  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
-  propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq ]
       ++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ])
       ++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
-    ++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 ])
+      ++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]);
-    ++ [(if (lib.strings.versionAtLeast version "6.0") then pythonDeps.qasync else python3Packages.quamash)];
-
-  dontWrapQtApps = true;
-  postFixup = ''
-    wrapQtApp "$out/bin/artiq_dashboard"
-    wrapQtApp "$out/bin/artiq_browser"
-    wrapQtApp "$out/bin/artiq_session"
-  '';
-
-  # Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses.
-  # Allows subprocesses using python to find all packages you have installed
-  makeWrapperArgs = [
-    ''--run 'if [ ! -z "$NIX_PYTHONPREFIX" ]; then export PATH=$NIX_PYTHONPREFIX/bin:$PATH;fi' ''
-    "--set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf"
-  ];
-
     checkInputs = [ binutils-or1k outputcheck ];
     checkPhase =
     ''
@@ -37,12 +21,10 @@ python3Packages.buildPythonPackage rec {
     cp --no-preserve=mode,ownership -R ${src}/artiq/test/lit $TESTDIR
     LIBARTIQ_SUPPORT=${libartiq-support}/libartiq_support.so ${lit}/bin/lit -v $TESTDIR/lit
     '';
-
+    meta = with stdenv.lib; {
-
-  meta = with lib; {
       description = "A leading-edge control system for quantum information experiments";
       homepage = https://m-labs/artiq;
       license = licenses.lgpl3;
       maintainers = [ maintainers.sb0 ];
     };
-}
+  }

artiq-fast/pkgs/binutils.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages
+{ stdenv, buildPackages
 , fetchurl, zlib
 , platform, target
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       `gprof', `nm', `strip', etc.
     '';
     homepage = http://www.gnu.org/software/binutils/;
-    license = lib.licenses.gpl3Plus;
+    license = stdenv.lib.licenses.gpl3Plus;
     /* Give binutils a lower priority than gcc-wrapper to prevent a
        collision due to the ld/as wrappers/symlinks in the latter. */
     priority = "10";

artiq-fast/pkgs/libartiq-support.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchgit, git, rustc }:
 stdenv.mkDerivation rec {
-  pname = "libartiq-support";
+  name = "libartiq-support-${version}";
   version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
 
   src = import ./artiq-src.nix { inherit fetchgit; };

artiq-fast/pkgs/llvm-or1k.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib
+{ stdenv
 , fetchFromGitHub, runCommand
 , perl, groff, cmake, libxml2, python, libffi, valgrind
 }:
@@ -25,12 +25,12 @@ let
     '';
 in
   stdenv.mkDerivation rec {
-    pname = "llvm-or1k";
+    name = "llvm-or1k";
-    version = "6.0.0";
     passthru.llvm-src = llvm-src;
     src = llvm-clang-src;
+    version = "6.0.0";
 
-    buildInputs = [ perl groff cmake libxml2 python libffi ] ++ lib.optional stdenv.isLinux valgrind;
+    buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
 
     preBuild = ''
       NIX_BUILD_CORES=4
@@ -59,8 +59,8 @@ in
     meta = {
       description = "Collection of modular and reusable compiler and toolchain technologies";
       homepage = http://llvm.org/;
-      license = lib.licenses.bsd3;
+      license = stdenv.lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [ sb0 ];
+      maintainers = with stdenv.lib.maintainers; [ sb0 ];
-      platforms = lib.platforms.all;
+      platforms = stdenv.lib.platforms.all;
     };
   }

artiq-fast/pkgs/llvmlite-artiq.nix

@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, llvm-or1k, makeWrapper, python3, ncurses, zlib, python3Packages }:
+{ stdenv, fetchFromGitHub, llvm-or1k, makeWrapper, python3, ncurses, zlib, python3Packages }:
 python3Packages.buildPythonPackage rec {
-  pname = "llvmlite-artiq";
+  name = "llvmlite-artiq";
   version = "0.23.0.dev";
   src = fetchFromGitHub {
     rev = "158f9d3a898dbf055ca513d69505df288c681fea";
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
 
   preBuild = "export LLVM_CONFIG=${llvm-or1k}/bin/llvm-config";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
       description = "A lightweight LLVM python binding for writing JIT compilers";
       homepage    = "http://llvmlite.pydata.org/";
       maintainers = with maintainers; [ sb0 ];

artiq-fast/pkgs/openocd.nix

@@ -1,22 +1,74 @@
-{ stdenv, buildEnv, lib, fetchFromGitHub, openocd }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libftdi, libusb1, pkgconfig, hidapi }:
-let
+
-  bscan_spi_bitstreams-pkg = stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-    name = "bscan_spi_bitstreams";
+  name = "openocd-mlabs-${version}";
+  version = "0.10.0";
+
   src = fetchFromGitHub {
+      owner = "m-labs";
+      repo = "openocd";
+      fetchSubmodules = true;
+      rev = "c383a57adcff332b2c5cf8d55a84626285b42c2c";
+      sha256 = "0xlj9cs72acx3zqagvr7f1c0v6lnqhl8fgrlhgmhmvk5n9knk492";
+  };
+  bscan_spi_bitstreams = fetchFromGitHub {
       owner = "quartiq";
       repo = "bscan_spi_bitstreams";
       rev = "01d8f819f15baf9a8cc5d96945a51e4d267ff564";
       sha256 = "1zqv47kzgvbn4c8cr019a6wcja7gn5h1z4kvw5bhpc72fyhagal9";
   };
-    phases = ["installPhase"];
+
-    installPhase =
+  nativeBuildInputs = [ pkgconfig ];
-    ''
+  buildInputs = [ autoreconfHook libftdi libusb1 hidapi ];
-    mkdir -p $out/share/bscan-spi-bitstreams
+
-    cp $src/*.bit $out/share/bscan-spi-bitstreams
+  configureFlags = [
+    "--enable-jtag_vpi"
+    "--enable-usb_blaster_libftdi"
+    "--enable-amtjtagaccel"
+    "--enable-gw16012"
+    "--enable-presto_libftdi"
+    "--enable-openjtag_ftdi"
+    "--enable-oocd_trace"
+    "--enable-buspirate"
+    "--enable-sysfsgpio"
+    "--enable-remote-bitbang"
+    "--disable-werror"
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-implicit-fallthrough"
+    "-Wno-format-truncation"
+    "-Wno-format-overflow"
+    "-Wno-error=tautological-compare"
+  ];
+
+  postInstall = ''
+    mkdir -p "$out/etc/udev/rules.d"
+    rules="$out/share/openocd/contrib/60-openocd.rules"
+    if [ ! -f "$rules" ]; then
+        echo "$rules is missing, must update the Nix file."
+        exit 1
+    fi
+    ln -s "$rules" "$out/etc/udev/rules.d/"
+
+    mkdir -p "$out/share/bscan-spi-bitstreams"
+    cp ${bscan_spi_bitstreams}/*.bit "$out/share/bscan-spi-bitstreams"
   '';
+
+  meta = with stdenv.lib; {
+    description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";
+    longDescription = ''
+      OpenOCD provides on-chip programming and debugging support with a layered
+      architecture of JTAG interface and TAP support, debug target support
+      (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.).  Several
+      network interfaces are available for interactiving with OpenOCD: HTTP,
+      telnet, TCL, and GDB.  The GDB server enables OpenOCD to function as a
+      "remote target" for source-level debugging of embedded systems using the
+      GNU GDB program.
+    '';
+    homepage = http://openocd.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ sb0 ];
+    platforms = platforms.linux;
   };
-in
+}
-  buildEnv {
-    name = "openocd-bscanspi";
-    paths = [ openocd bscan_spi_bitstreams-pkg ];
-  }

artiq-fast/pkgs/python-deps.nix

@@ -1,21 +1,21 @@
-{ lib, fetchgit, fetchFromGitHub, python3Packages, misoc-new }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
 rec {
   # User dependencies
   sipyco = python3Packages.buildPythonPackage rec {
-    pname = "sipyco";
+    name = "sipyco";
-    version = "1.2";
+    version = "1.1";
     src = fetchFromGitHub {
       owner = "m-labs";
       repo = "sipyco";
       rev = "v${version}";
-      sha256 = "02x2s66x9bbzj82d823vjg2i73w7iqwvkrjbbyrsav6ccj7f90sj";
+      sha256 = "09vyrzfhnbp65ybd7w2g96gvvnhzafpn72syls2kbg2paqjjf9gs";
     };
     propagatedBuildInputs = with python3Packages; [ numpy ];
   };
 
   asyncserial = python3Packages.buildPythonPackage rec {
-    pname = "asyncserial";
+    name = "asyncserial";
     version = "0.1";
     src = fetchFromGitHub {
       owner = "m-labs";
@@ -27,7 +27,7 @@ rec {
   };
 
   pythonparser = python3Packages.buildPythonPackage rec {
-    pname = "pythonparser";
+    name = "pythonparser";
     version = "1.3";
     src = fetchFromGitHub {
       owner = "m-labs";
@@ -35,81 +35,41 @@ rec {
       rev = "5b391fe86f43bb9f4f96c5bc0532e2a112db2936";
       sha256 = "1gw1fk4y2l6bwq0fg2a9dfc1rvq8cv492dyil96amjdhsxvnx35b";
     };
-    patches = [ ./pythonparserver.patch ];
+    patches = [ ./python37hack.patch ];
     propagatedBuildInputs = with python3Packages; [ regex ];
   };
 
   pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
-    pname = "pyqtgraph_qt5";
+    name = "pyqtgraph_qt5-${version}";
-    version = "0.11.0";
+    version = "0.10.0";
     doCheck = false;
-    pythonImportsCheck = [ "pyqtgraph" ];
     src = fetchFromGitHub {
       owner = "pyqtgraph";
       repo = "pyqtgraph";
-      rev = "pyqtgraph-${version}";
+      rev = "1426e334e1d20542400d77c72c132b04c6d17ddb";
-      sha256 = "03fvpkqdn80ni51msvyivmghw41qk4vplwdqndkvzzzlppimdjbn";
+      sha256 = "1079haxyr316jf0wpirxdj0ry6j8mr16cqr0dyyrd5cnxwl7zssh";
     };
     propagatedBuildInputs = with python3Packages; [ scipy numpy pyqt5 pyopengl ];
   };
 
-  qasync = python3Packages.buildPythonPackage rec {
+  # Development/firmware dependencies
-    pname = "qasync";
+  misoc = python3Packages.buildPythonPackage rec {
-    version = "0.10.0";
+    name = "misoc";
     
     src = fetchFromGitHub {
-      owner = "CabbageDevelopment";
-      repo = "qasync";
-      rev = "v${version}";
-      sha256 = "1zga8s6dr7gk6awmxkh4pf25gbg8n6dv1j4b0by7y0fhi949qakq";
-    };
-
-    propagatedBuildInputs = [ python3Packages.pyqt5 ];
-
-    checkInputs = [ python3Packages.pytest ];
-    checkPhase = ''
-      pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio
-    '';
-  };
-
-  # Development/firmware dependencies
-  artiq-netboot = python3Packages.buildPythonPackage rec {
-    pname = "artiq-netboot";
-    version = "unstable-2020-10-15";
-
-    src = fetchgit {
-      url = "https://git.m-labs.hk/m-labs/artiq-netboot.git";
-      rev = "04f69eb07df73abe4b89fde2c24084f7664f2104";
-      sha256 = "0ql4fr8m8gpb2yql8aqsdqsssxb8zqd6l65kl1f6s9845zy7shs9";
-    };
-  };
-
-  misoc = python3Packages.buildPythonPackage {
-    pname = "misoc";
-    version = if misoc-new then "unstable-2021-07-22" else "unstable-2021-02-15";
-
-    src = if misoc-new
-      then (fetchFromGitHub {
       owner = "m-labs";
       repo = "misoc";
-        rev = "79a27a82050266ce4d99d35ca0fe6b53a44649ac";
+      rev = "7e5fe8d38835175202dad2c51d37b20b76fd9e16";
-        sha256 = "10pq3ll3h7mrfgk552nlr80v26gr4mvmpb5pd2h5ck2s9gpkkb82";
+      sha256 = "0i8bppz7x2s45lx9n49c0r87pqps09z35yzc17amvx21qsplahxn";
       fetchSubmodules = true;
-      })
+    };
-      else (fetchFromGitHub {
-        owner = "m-labs";
-        repo = "misoc";
-        rev = "d84551418042cea0891ea743442e20684b51e77a";
-        sha256 = "1id5qjr9dl4r3vi6jdn7dfpnr2wb08nrm3nfscn18clbbdxybyjn";
-        fetchSubmodules = true;
-      });
 
     # TODO: fix misoc bitrot and re-enable tests
     doCheck = false;
     
     propagatedBuildInputs = with python3Packages; [ pyserial jinja2 numpy asyncserial migen ];
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "A high performance and small footprint system-on-chip based on Migen";
       homepage    = "https://m-labs.hk/migen";
       license     = licenses.bsd2;
@@ -118,19 +78,18 @@ rec {
   };
 
   migen = python3Packages.buildPythonPackage rec {
-    pname = "migen";
+    name = "migen";
-    version = "unstable-2021-02-08";
 
     src = fetchFromGitHub {
       owner = "m-labs";
       repo = "migen";
-      rev = "7014bdccc11270764186e6a4441fb58238c612aa";
+      rev = "b1b2b298b85a795239daad84c75be073ddc4f8bd";
-      sha256 = "12mhmcdf0jqv33ald9x9zb1qi26sw4ywdfgg5saqvmx0pmbmvynk";
+      sha256 = "1qy2ydk8xqqv92i992j1g71fbi185zd6s3kigzsf3169874dyh81";
     };
 
     propagatedBuildInputs = with python3Packages; [ colorama ];
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "A Python toolbox for building complex digital hardware";
       homepage    = "https://m-labs.hk/migen";
       license     = licenses.bsd2;
@@ -139,8 +98,7 @@ rec {
   };
 
   microscope = python3Packages.buildPythonPackage rec {
-    pname = "microscope";
+    name = "microscope";
-    version = "unstable-2019-05-17";
 
     src = fetchFromGitHub {
       owner = "m-labs";
@@ -151,7 +109,7 @@ rec {
 
     propagatedBuildInputs = with python3Packages; [ pyserial prettytable msgpack migen ];
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "Finding the bacteria in rotting FPGA designs";
       homepage    = "https://m-labs.hk/migen";
       license     = licenses.bsd2;
@@ -160,19 +118,18 @@ rec {
   };
 
   jesd204b = python3Packages.buildPythonPackage rec {
-    pname = "jesd204b";
+    name = "jesd204b";
-    version = "unstable-2021-05-05";
 
     src = fetchFromGitHub {
       owner = "m-labs";
       repo = "jesd204b";
-      rev = "bf1cd9014c8b7a9db67609f653634daaf3bcd39b";
+      rev = "ac877ac5975411a438415f824e182338ed773529";
-      sha256 = "035csm6as4p75cjz7kd6gnras14856i2jzi9g1gd800g284hw9n3";
+      sha256 = "1lkb7cyj87bq4y0hp6379jq4q4lm2ijldccpyhawiizcfkawxa10";
     };
 
     propagatedBuildInputs = with python3Packages; [ migen misoc ];
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "JESD204B core for Migen/MiSoC";
       homepage    = "https://m-labs.hk/migen";
       license     = licenses.bsd2;
@@ -189,7 +146,7 @@ rec {
       sha256 = "0j15i54p7nri6hkzn1wal9pxri4pgql01wgjccig6ar0v5jjbvsy";
     };
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "Super-fast and clean conversions to numbers";
       homepage    = "https://github.com/SethMMorton/fastnumbers";
       license     = licenses.mit;
@@ -198,8 +155,7 @@ rec {
   };
 
   ramda = python3Packages.buildPythonPackage {
-    pname = "ramda";
+    name = "ramda";
-    version = "unstable-2019-02-01";
 
     src = fetchFromGitHub {
       owner = "peteut";
@@ -218,7 +174,7 @@ rec {
       export PBR_VERSION=0.0.1
     '';
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "Ramda, ported to Python";
       homepage    = "https://github.com/peteut/ramda.py";
       license     = licenses.mit;
@@ -227,14 +183,13 @@ rec {
   };
 
   migen-axi = python3Packages.buildPythonPackage {
-    pname = "migen-axi";
+    name = "migen-axi";
-    version = "unstable-2021-01-22";
 
     src = fetchFromGitHub {
       owner = "peteut";
       repo = "migen-axi";
-      rev = "9439ee900358598cecc682db327aa30e506172b5";
+      rev = "c4002f7db62cb9c4599336a9413006ee1d138fbd";
-      sha256 = "1z5s8ifq7fbpqi6sx2i87rmz63kbgh9ck94fs2qf21ixhxi46nm3";
+      sha256 = "0p2ndznch7z4sbp4m8hq49rkg7p4vcrlbbfk6l8644wyl1kk0fvg";
     };
 
     nativeBuildInputs = [ python3Packages.pbr ];
@@ -249,21 +204,17 @@ rec {
         --replace "ramda==0.5.5" "ramda"
       substituteInPlace requirements.txt \
         --replace "colorama==0.4.3" "colorama"
-      substituteInPlace requirements.txt \
-        --replace "toolz==0.10.0" "toolz"
-      substituteInPlace requirements.txt \
-        --replace "pyserial==3.4" "pyserial"
     '';
 
 
-    checkInputs = [ python3Packages.pytest python3Packages.pytest-timeout python3Packages.pytest-flake8 ];
+    checkInputs = [ python3Packages.pytest python3Packages.pytest-flake8 ];
     checkPhase = "pytest";
 
     preBuild = ''
       export PBR_VERSION=0.0.1
     '';
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "AXI support for Migen/MiSoC";
       homepage    = "https://github.com/peteut/migen-axi";
       license     = licenses.mit;
@@ -284,7 +235,7 @@ rec {
     # Non-standard test suite. Needs custom checkPhase.
     doCheck = false;
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "Portable tool for executing LLVM and Clang style test suites";
       homepage = http://llvm.org/docs/CommandGuide/lit.html;
       license = licenses.ncsa;
@@ -303,7 +254,7 @@ rec {
     };
     prePatch = "echo ${version} > RELEASE-VERSION";
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       description = "A tool for checking tool output inspired by LLVM's FileCheck";
       homepage    = "https://github.com/stp/OutputCheck";
       license     = licenses.bsd3;

artiq-fast/pkgs/python37hack.patch

@@ -1,27 +1,25 @@
 diff --git a/pythonparser/lexer.py b/pythonparser/lexer.py
-index a62eaf1..c70e85a 100644
+index a62eaf1..2c48d36 100644
 --- a/pythonparser/lexer.py
 +++ b/pythonparser/lexer.py
-@@ -79,6 +79,8 @@ class Lexer:
+@@ -79,6 +79,7 @@ class Lexer:
          (3, 4): _reserved_3_1,
          (3, 5): _reserved_3_5,
          (3, 6): _reserved_3_5,
 +        (3, 7): _reserved_3_5,
-+        (3, 8): _reserved_3_5,
      }
      """
      A map from a tuple (*major*, *minor*) corresponding to Python version to
-@@ -102,6 +104,8 @@ class Lexer:
+@@ -102,6 +103,7 @@ class Lexer:
          (3, 4): _string_prefixes_3_3,
          (3, 5): _string_prefixes_3_3,
          (3, 6): _string_prefixes_3_6,
 +        (3, 7): _string_prefixes_3_6,
-+        (3, 8): _string_prefixes_3_6,
      }
      """
      A map from a tuple (*major*, *minor*) corresponding to Python version to
 diff --git a/pythonparser/parser.py b/pythonparser/parser.py
-index 10c741d..62b93e1 100644
+index 10c741d..f748695 100644
 --- a/pythonparser/parser.py
 +++ b/pythonparser/parser.py
 @@ -419,7 +419,7 @@ class Parser(object):
@@ -29,7 +27,7 @@ index 10c741d..62b93e1 100644
              self.yield_expr      = self.yield_expr__26
              return
 -        elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6)):
-+        elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)):
++        elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7)):
              if version == (3, 0):
                  self.with_stmt       = self.with_stmt__26 # lol
              else:

artiq-fast/pkgs/rust/binaryBuild.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, bash, buildRustPackage, curl, darwin
+{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin
 , version
 , src
 , platform
@@ -6,7 +6,7 @@
 }:
 
 let
-  inherit (lib) optionalString;
+  inherit (stdenv.lib) optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
   bootstrapping = versionType == "bootstrap";
@@ -26,14 +26,14 @@ rec {
     inherit version;
     inherit src;
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       homepage = http://www.rust-lang.org/;
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ sb0 ];
       license = [ licenses.mit licenses.asl20 ];
     };
 
-    buildInputs = [ bash ] ++ lib.optional stdenv.isDarwin Security;
+    buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
@@ -60,7 +60,7 @@ rec {
         install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"
         install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
         install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
-        install_name_tool -change /usr/lib/libcurl.4.dylib '${lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
+        install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
         for f in $out/lib/lib*.dylib; do
           install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"
         done
@@ -80,14 +80,14 @@ rec {
     inherit version;
     inherit src;
 
-    meta = with lib; {
+    meta = with stdenv.lib; {
       homepage = http://www.rust-lang.org/;
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ sb0 ];
       license = [ licenses.mit licenses.asl20 ];
     };
 
-    buildInputs = [ makeWrapper bash ] ++ lib.optional stdenv.isDarwin Security;
+    buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
     postPatch = ''
       patchShebangs .
@@ -107,7 +107,7 @@ rec {
       ${optionalString (stdenv.isDarwin && bootstrapping) ''
         install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
         install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
-        install_name_tool -change /usr/lib/libcurl.4.dylib '${lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
+        install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
       ''}
 
       wrapProgram "$out/bin/cargo" \

artiq-fast/pkgs/rust/cargo.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, file, curl, pkgconfig, python, openssl, cmake, zlib
+{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
 , fetchurl
 }:
@@ -6,12 +6,11 @@
 rustPlatform.buildRustPackage rec {
   # Note: we can't build cargo 1.28.0 because rustc tightened the borrow checker rules and broke
   # backward compatibility, which affects old cargo versions.
-  # There are also issues with asm/llvm_asm with recent rustc and cargo versions prior to 1.39.
+  name = "cargo-${version}";
-  pname = "cargo";
+  version = "1.37.0";
-  version = "1.39.0";
   src = fetchurl {
-    url = "https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz";
+    url = "https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.gz";
-    sha256 = "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl";
+    sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
   };
 
   # the rust source tarball already has all the dependencies vendored, no need to fetch them again
@@ -52,7 +51,7 @@ rustPlatform.buildRustPackage rec {
   # Disable check phase as there are failures (4 tests fail)
   doCheck = false;
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://crates.io;
     description = "Downloads your Rust project's dependencies and builds your project";
     maintainers = with maintainers; [ wizeman retrry ];

artiq-fast/pkgs/rust/rustc.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, targetPackages
+{ stdenv, targetPackages
 , fetchurl, file, python2, tzdata, ps
 , llvm-or1k, ncurses, zlib, darwin, rustPlatform, git, cmake, curl
 , which, libffi, gdb
@@ -14,7 +14,7 @@
 }:
 
 let
-  inherit (lib) optional optionalString;
+  inherit (stdenv.lib) optional optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
   target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
@@ -26,7 +26,7 @@ let
 in
 
 stdenv.mkDerivation {
-  pname = "rustc";
+  name = "rustc-${version}";
   inherit version;
 
   inherit src;
@@ -171,7 +171,7 @@ stdenv.mkDerivation {
   # https://github.com/rust-lang/rust/issues/30181
   # enableParallelBuilding = false;
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://www.rust-lang.org/;
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ sb0 ];

artiq-fast/shell-dev.nix

@@ -8,7 +8,7 @@ in
     buildInputs = [
       vivado
       pkgs.gnumake
-      (pkgs.python3.withPackages(ps: (with ps; [ jinja2 jsonschema numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ])))
+      (pkgs.python3.withPackages(ps: (with ps; [ jinja2 numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ])))
       artiqpkgs.cargo
       artiqpkgs.rustc
       artiqpkgs.binutils-or1k

artiq-fast/wfvm-legacy.nix

@@ -1,16 +0,0 @@
-{ pkgs }:
-
-let
-  # Pin nixpkgs to avoid frequent resource-intensive Windows reinstallations on Hydra.
-  wfvm-pkgs = pkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "f8248ab6d9e69ea9c07950d73d48807ec595e923";
-    sha256 = "009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk";
-  };
-  wfvm = pkgs.fetchgit {
-    url = "https://git.m-labs.hk/M-Labs/wfvm.git";
-    rev = "4b497938ffd9fcddf84a3dbe2f01524395292adb";
-    sha256 = "0m3kdbbcskqc1lf8b5f7ccbll9b7vkl4r00kbyx3yjb2rs6cqvil";
-  };
-in import "${wfvm}/wfvm" { pkgs = (import wfvm-pkgs {}); }

artiq-fast/wfvm.nix

@@ -10,7 +10,7 @@ let
   };
   wfvm = pkgs.fetchgit {
     url = "https://git.m-labs.hk/M-Labs/wfvm.git";
-    rev = "6d9d9d91f66929574b7c8e5dacb3a611939bfaf1";
+    rev = "304a102b61ae1649739129510bbfc2f162e069b7";
-    sha256 = "02b7rs46ia3vvw0r98ih6i2xb6k952hza4i8h4gi0r8dzplsg004";
+    sha256 = "0ss7z5inp2fbrqjpp296iy04m8v3bwiajhwa7w5ijixva5v2mmg0";
   };
 in import "${wfvm}/wfvm" { pkgs = (import wfvm-pkgs {}); }

artiq-fast/windows/conda_noarch_packages.nix

@@ -1,22 +1,27 @@
 { pkgs } : [
 
 (pkgs.fetchurl {
-  url = "https://conda.anaconda.org/conda-forge/noarch/prettytable-2.1.0-pyhd8ed1ab_0.tar.bz2";
+  url = "https://conda.anaconda.org/conda-forge/noarch/prettytable-0.7.2-py_3.tar.bz2";
-  sha256 = "1w71padwzy6ay5g8zl575ali994cssgcgzf5917rap3fmw2mgg4d";
+  sha256 = "0b7s4xm6bbkcg37sf1i3mxrbac0vxhryq22m3qx4x9kh6k2c5g5q";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/noarch/six-1.16.0-pyhd3eb1b0_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/noarch/six-1.15.0-py_0.tar.bz2";
-  sha256 = "120wav3bxbyv0jsvbl94rxsigqqchsqg4qqxccg9ij7ydirmqaql";
+  sha256 = "08rsfp9bd2mz8r120s8w5vgncy0gn732xa0lfgbmx833548cfqmb";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/noarch/pyqtgraph-0.11.0-py_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/noarch/python-dateutil-2.8.1-py_0.tar.bz2";
-  sha256 = "1jnid69dpvhd8nscmkm761qpqz8ip0gka5av90xs3i0pqkqmffqg";
+  sha256 = "0cbcd0jq6683ibj8ncsmmrbhbjvwww8i22lb68bx4xfzsmb9z8cb";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/noarch/cached-property-1.5.2-py_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/noarch/cached-property-1.5.1-py_1.tar.bz2";
-  sha256 = "01mcbrsrdwvinyvp0fs2hbkczydb33gbz59ldhb1484w5mm9y9bi";
+  sha256 = "1yl6h3wb6hxgw79i7rpgpq260l5vqfcj5dv5kyxn8z99xdkp52q5";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/noarch/pycparser-2.20-py_0.tar.bz2";
+  sha256 = "1qwcb07q8cjz0qpj6pfxb0qb68kddmx9bv9wr5pghwz78q8073z9";
 })
 ]

artiq-fast/windows/conda_win-64_packages.nix

@@ -1,67 +1,132 @@
 { pkgs } : [
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/numpy-base-1.20.2-py38hc2deb75_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/regex-2020.5.14-py37he774522_0.tar.bz2";
-  sha256 = "1940fryxlil04d5y0df1s1sydhny8l97slvfm7v40mxibdmf2sdn";
+  sha256 = "125l0ywc17h5hlpidjbr7dxyz9c24xmfjllj19dmvbx8hdlmvp99";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/hdf5-1.10.6-h7ebc959_0.tar.bz2";
+  url = "https://conda.anaconda.org/conda-forge/win-64/python_abi-3.7-1_cp37m.tar.bz2";
-  sha256 = "09bik65gspyrqj3j5p67wf2ywhgyfz3pkw39gwdzha7yyjkkzx0q";
+  sha256 = "04dllvrvczky7p7d82iqj7czmy5mm8w7h2gg0zpjzx0s09gkq09l";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/certifi-2021.5.30-py38haa95532_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/icu-58.2-ha925a31_3.tar.bz2";
-  sha256 = "0hzj23xjw88wllz1l4qdnzp335608vm8pl7w1ka9pkg6ip69lnpm";
+  sha256 = "0vcl0j3v9ab022s2g3a9iv1pn7sflh670yyf5m08hdyf049m3jz7";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/sqlite-3.36.0-h2bbff1b_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/pip-20.1.1-py37_1.tar.bz2";
-  sha256 = "15w0lhcl97wafqvc6ccc96311wc5rrmh16i4ki1pw6kzkfmr1k6r";
+  sha256 = "0wx0sdjq2kkdid4m0iss1bxjhpdk1lnrqsl3w7bqc0papz3gbx0a";
 })
 
 (pkgs.fetchurl {
-  url = "https://conda.anaconda.org/conda-forge/win-64/libgit2-1.1.1-h8648793_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/mkl_fft-1.1.0-py37h45dec08_0.tar.bz2";
-  sha256 = "0rwmd48g7sywmxgcyjad3hznpm15d3w5604syrkcs2ryih0cgwkd";
+  sha256 = "1v73rd107x1r77gv77cn2bv50hr15c0rwspzf7pdp93i5ydk7fm0";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/h5py-3.2.1-py38h3de5c98_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/tk-8.6.10-he774522_0.tar.bz2";
-  sha256 = "17czl7gvv6d9v6ng9l6c0i1iy181cr1qq7cyn2s90kamnfh3dx8b";
+  sha256 = "15bfncacdxmcbn4xixmfz2m7a09k7hcpwxvwn1lki84bx0fmzsis";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/numpy-1.20.2-py38ha4e8547_0.tar.bz2";
+  url = "https://conda.anaconda.org/conda-forge/win-64/pygit2-1.2.1-py37h4ab8f01_0.tar.bz2";
-  sha256 = "0w4hkirwgh4bp7djzxp2yh086jfdbz1y3njsrpqm441rjjq39hpz";
+  sha256 = "1rj6bmf56g3imcrhfd67nqfzd5jjpnmbck714p6aqljxjw5x1zja";
 })
 
 (pkgs.fetchurl {
-  url = "https://conda.anaconda.org/conda-forge/win-64/python_abi-3.8-2_cp38.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/certifi-2020.6.20-py37_0.tar.bz2";
-  sha256 = "1j62rls5r6646b7gagc7d6jj6sqiyqd9vq442dqg3pwyldlz3zqg";
+  sha256 = "0601dwm5grhwnq7kvhz9sr49pw72ji8xbc28jc6z3pzihin243fy";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/python-levenshtein-0.12.2-py38h2bbff1b_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/libssh2-1.9.0-h7a1dbc1_1.tar.bz2";
-  sha256 = "0xvl3v7q1wr0a8li3f8d7hara58lcvrr6hmcd6cqkvcnhggkhp9s";
+  sha256 = "0sz405ab3n7991hxy8l9affs1slivsimgadxsdr6wvpgx3j4aqgx";
 })
 
 (pkgs.fetchurl {
-  url = "https://conda.anaconda.org/conda-forge/win-64/pygit2-1.6.1-py38h294d835_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/vs2015_runtime-14.16.27012-hf0eaf9b_2.tar.bz2";
-  sha256 = "0frgv2b1ckgp8w574abliz369lbziyqsipkwxcjy4l9rbn2pa0rj";
+  sha256 = "1gbm6i6nkp8linmak5mm42hj1nzqd5ppak8kv1n3wfn52p21ngvs";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/ca-certificates-2021.5.25-haa95532_1.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/intel-openmp-2020.1-216.tar.bz2";
-  sha256 = "0g77ic1hs9gj9nknjgrn7byk63z82ima7gqynjcds1kbk8cy4hcd";
+  sha256 = "097kkdpd27gc5v5fwsanbrpvmkqricbkd2igglz0yym0x2rldgb8";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/pip-21.1.3-py38haa95532_0.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/zlib-1.2.11-h62dcd97_4.tar.bz2";
-  sha256 = "1wzb3f3n1lndmxbr3agmx4rr1k11jf60fcrqmgr1d7a3ygqvqy4q";
+  sha256 = "1jxd7sg0c278hqv09q6hridpdnyhkd34gbs92wkravj3gwsr1adk";
 })
 
 (pkgs.fetchurl {
-  url = "https://repo.anaconda.com/pkgs/main/win-64/python-3.8.10-hdbf39b2_7.tar.bz2";
+  url = "https://repo.anaconda.com/pkgs/main/win-64/pyqtgraph-0.10.0-py37h28b3542_3.tar.bz2";
-  sha256 = "05p2g1552crfmcf4a9wfjg4d1qngsvi1srpca2hqr6s9slip2w19";
+  sha256 = "1vfxym7lpiv624ll82yp07v2906chdzvczjj9xbvfvk2sk0w1nk7";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/python-levenshtein-0.12.0-py37he774522_1001.tar.bz2";
+  sha256 = "0wgk6wi4hcc1msv6467y8rhd3zpxrlb6dc0a4fg5wrvzww9wh4dx";
+})
+
+(pkgs.fetchurl {
+  url = "https://conda.anaconda.org/conda-forge/win-64/libgit2-1.0.0-h79a9ecc_0.tar.bz2";
+  sha256 = "1pi4hd4kah49wzy00iml5wpbscc0lx6ljk6lwnx92gas5z8856jd";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/setuptools-47.3.1-py37_0.tar.bz2";
+  sha256 = "1lljknly57bh73h30hn6vv826dx4vls736psa9jvf0d6l2kqrzrq";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/libcurl-7.69.1-h2a8f88b_0.tar.bz2";
+  sha256 = "182zrmgl2142gfgnbgjsk0gbj85vw75xzxvhn9lzm485ghxsasvg";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/mkl_random-1.1.1-py37h47e9c7a_0.tar.bz2";
+  sha256 = "1f85bd7rrzdprgmk83v1klana32j016128fkxk8kpk7idfd36zqv";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/python-3.7.7-h81c818b_4.tar.bz2";
+  sha256 = "092bv939n68yjkcm7q626nd6s5kqqvdrgjfqn1nadnqig612w2p9";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/curl-7.69.1-h2a8f88b_0.tar.bz2";
+  sha256 = "0hw5dh7gzx8fap4c3vkc2xc2q9by3f5ndbigr6pm6w5v29qaydn4";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/openssl-1.1.1g-he774522_0.tar.bz2";
+  sha256 = "1gwfj33qb8inikdhmgcm30iz1ag8x71lzicsxbdr7ni4153df5gb";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/scipy-1.5.0-py37h9439919_0.tar.bz2";
+  sha256 = "01pj0a82y9qd9z5fn5gv4argcc5g5s8kqj0lwjy9hj50qf6qwj76";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/numpy-1.18.5-py37h6530119_0.tar.bz2";
+  sha256 = "1knb5na7ij7ik76blsgwhdsy3i9r2l0154z5g5dkb2ds3sk878np";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/sqlite-3.32.3-h2a8f88b_0.tar.bz2";
+  sha256 = "1ddzwj0f6jikj6hsasg3vlwamsqhf5lc8k1la7gqbd77s11b8isc";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/numpy-base-1.18.5-py37hc3f5095_0.tar.bz2";
+  sha256 = "1dyxk2v7rm87najv3f8i04q44wxicfx9qrap9dy2vpqlrz3bj82j";
+})
+
+(pkgs.fetchurl {
+  url = "https://repo.anaconda.com/pkgs/main/win-64/mkl-2020.1-216.tar.bz2";
+  sha256 = "1klj0sjlj5x1anjbkf017f16ssc65dkpg1rrn06njirbhwsc9w5m";
 })
 ]

artiq-fast/windows/make_conda_packages.sh

@@ -1,13 +1,8 @@
 #!/usr/bin/env bash
 
-# Run manually to build the list of conda dependencies to install in the
+# run manually to build the list of conda dependencies to install in the
 # test environments.
 
-# NOTE: This procedure encounters failing HTTPS handshakes. To circumvent just
-# for testing, insert `call conda config --set ssl_verify no` into
-# getcondapackages.bat. To securely update the sources lists update the RTC
-# hack to the proper date instead.
-
 set -e
 
 nix-build -E "

artiq-fast/windows/run-test.nix

@@ -10,12 +10,11 @@ let
       inherit port;
     }) tcpPorts;
 
-  artiq6 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "6.0";
+  wfvm = import ../wfvm.nix { inherit pkgs; };
-  wfvm = import (if artiq6 then ../wfvm.nix else ../wfvm-legacy.nix) { inherit pkgs; };
   conda-deps = {
     name = "conda-deps";
     script = let
-      qt-asyncio-package = if artiq6 then artiqpkgs.conda-qasync else artiqpkgs.conda-quamash;
+      artiq6 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "6.0";
       conda-deps-noarch = import (if artiq6 then ./conda_noarch_packages.nix else ./conda_noarch_packages-legacy.nix) { inherit pkgs; };
       conda-deps-win-64 = import (if artiq6 then ./conda_win-64_packages.nix else ./conda_win-64_packages-legacy.nix) { inherit pkgs; };
       conda-packages-put = pkgs.lib.strings.concatStringsSep "\n"
@@ -33,7 +32,7 @@ let
 
       win-put ${artiqpkgs.conda-pythonparser}/noarch/*.tar.bz2 'fake-channel/noarch'
       win-put ${artiqpkgs.conda-sipyco}/noarch/*.tar.bz2 'fake-channel/noarch'
-      win-put ${qt-asyncio-package}/noarch/*.tar.bz2 'fake-channel/noarch'
+      win-put ${artiqpkgs.conda-quamash}/noarch/*.tar.bz2 'fake-channel/noarch'
       '';
   };
 in

artiq-full.nix

@@ -1,70 +1,16 @@
-{ pkgs ? import <nixpkgs> {}
+{ pkgs ? import <nixpkgs> {}}:
-, a6p ? <a6p>
-}:
 
 let
-  sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>;
+  sinaraSystemsSrc = <sinaraSystemsSrc>;
-  sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>;
-  sinaraSystemsSrc =
-    if a6p
-    then pkgs.fetchgit {
-      url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
-      rev = sinaraSystemsRev;
-      sha256 = sinaraSystemsHash;
-    }
-    else <sinaraSystemsSrc>;
-  artiq-fast =
-    if a6p
-    then <artiq-board-generated/fast>
-    else <artiq-fast>;
-  artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
-    inherit (pkgs) stdenv git fetchgit;
-  };
-  targets = import ./artiq-full/artiq-targets.nix {
-    inherit pkgs artiqVersion sinaraSystemsSrc;
-  };
-  kasliVariants = map ({ variant, ... }: variant) (
-    builtins.filter ({ target, ... }: target == "kasli") (
-      builtins.attrValues targets
-    )
-  );
-  standaloneVariants = map ({ variant, ... }: variant) (
-    builtins.filter ({ target, standalone ? false, ... }: target == "kasli" && standalone) (
-      builtins.attrValues targets
-    )
-  );
-  serializedTargets = pkgs.lib.generators.toPretty {} (
-    map (conf:
-      if conf ? buildCommand
-      then conf // {
-        buildCommand = builtins.replaceStrings ["$"] ["\\\\\\$"]  conf.buildCommand;
-      }
-      else conf
-    ) (builtins.attrValues targets)
-  );
 
   generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
     ''
     mkdir $out
 
-    ${if a6p
+    cp -a ${<artiq-fast>} $out/fast
-      then ''
+    cp ${./artiq-full/conda-artiq-board.nix} $out/conda-artiq-board.nix
-        cp -a ${<artiq-board-generated>} $out/board-generated
+    cp ${./artiq-full/extras.nix} $out/extras.nix
-        ln -s board-generated/fast $out/fast
-      ''
-      else "cp -a ${<artiq-fast>} $out/fast"}
-    cp ${./artiq-full}/artiq-board-vivado.nix $out
-    cp ${./artiq-full}/generate-identifier.py $out
-    cp ${./artiq-full}/conda-artiq-board.nix $out
-    cp ${./artiq-full}/extras.nix $out
-    cp ${./artiq-full}/*.patch $out
 
-    ${if a6p
-      then ''
-        REV=${sinaraSystemsRev}
-        HASH=${sinaraSystemsHash}
-      ''
-      else ''
     REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
     SINARA_SRC_CLEAN=`mktemp -d`
     cp -a ${sinaraSystemsSrc}/. $SINARA_SRC_CLEAN
@@ -72,56 +18,104 @@ let
     chmod 755 $SINARA_SRC_CLEAN
     rm -rf $SINARA_SRC_CLEAN/.git
     HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
-      ''}
     cat > $out/default.nix << EOF
     { pkgs ? import <nixpkgs> {}}:
 
     let
-      artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; };
+      artiq-fast = import ./fast { inherit pkgs; };
-      ddbDeps = [
-        artiq-fast.artiq
-        (pkgs.python3.withPackages (ps: [ ps.jsonschema ]))
-      ];
 
-      kasliVariants = [${builtins.concatStringsSep " " (
+      target = "kasli";
-        builtins.map (variant: "\"${variant}\"") kasliVariants
+      variants = [
-      )}];
+        "afmaster"
-      standaloneVariants = [${builtins.concatStringsSep " " (
+        "afsatellite"
-        builtins.map (variant: "\"${variant}\"") standaloneVariants
+        "berkeley2"
-      )}];
+        "berkeley3"
+        "csu"
+        "duke"
+        "duke2"
+        "duke3"
+        "femto1"
+        "femto2"
+        "femto3"
+        "freiburg1"
+        "griffith"
+        "hub"
+        "hw"
+        "indiana"
+        "innsbruck2"
+        "ist"
+        "liaf"
+        "luh"
+        "luh2"
+        "luh3"
+        "mikes"
+        "mit"
+        "mitll3"
+        "mitll4master"
+        "mitll4satellite"
+        "mpik"
+        "mpq"
+        "nict"
+        "nist"
+        "no"
+        "npl1"
+        "npl2"
+        "oklahoma"
+        "olomouc"
+        "opticlock"
+        "oregon"
+        "osaka"
+        "ptb"
+        "ptb2"
+        "ptb3"
+        "ptb4"
+        "ptb5"
+        "ptb6"
+        "ptbal"
+        "ptbin"
+        "purdue"
+        "qe"
+        "qleds"
+        "rice"
+        "saymamaster"
+        "siegen"
+        "su"
+        "sydney"
+        "uaarhus"
+        "ubirmingham"
+        "ugranada"
+        "unlv"
+        "unsw2"
+        "ustc2"
+        "vlbaimaster"
+        "vlbaisatellite"
+        "wipm"
+        "wipm4"
+        "wipm5master"
+        "wipm5satellite"
+      ] ++ (pkgs.lib.lists.optionals (pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") [
+        "bonn1master"
+        "bonn1satellite"
+        "hw2master"
+        "hw2satellite"
+        "uamsterdam"
+      ]);
 
-      vivado = import ${if a6p then "./board-generated" else "."}/fast/vivado.nix {
+      vivado = import ./fast/vivado.nix { inherit pkgs; };
-        inherit pkgs;
+      artiq-board = import ./fast/artiq-board.nix { inherit pkgs vivado; };
-      };
-      artiq-board =
-        ${if a6p
-        then ''
-          import ./artiq-board-vivado.nix {
-            inherit pkgs vivado;
-            version = artiq-fast.artiq.version;
-            board-generated = import ./board-generated {
-              inherit pkgs;
-            };
-          }
-        ''
-        else ''
-          import ./fast/artiq-board.nix {
-            inherit pkgs vivado;
-          }
-        ''};
       conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
       src = pkgs.fetchgit {
         url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
         rev = "$REV";
         sha256 = "$HASH";
       };
-      artiq-targets = pkgs.lib.lists.foldr (conf: start:
+      generic-kasli = pkgs.lib.lists.foldr (variant: start:
         let
-          inherit (conf) target variant;
+          json = builtins.toPath (src + "/\''${variant}.json");
-          json = src + "/\''${variant}.json";
+          boardBinaries = artiq-board {
-          boardBinaries = artiq-board (conf // {
+            inherit target variant;
-            src = json;
+            buildCommand = "python -m artiq.gateware.targets.kasli_generic \''${json}";
-          });
+          };
         in
           start // {
             "artiq-board-\''${target}-\''${variant}" = boardBinaries;
@@ -129,13 +123,10 @@ let
               boardBinaries = boardBinaries;
               inherit target variant;
             };
-          } // (pkgs.lib.optionalAttrs (
+          } // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") {
-            target == "kasli" &&
-             builtins.elem variant standaloneVariants
-          ) {
             "device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
               name = "device-db-\''${target}-\''${variant}";
-              buildInputs = ddbDeps;
+              buildInputs = [ artiq-fast.artiq ];
               phases = [ "buildPhase" ];
               buildPhase = "
                 mkdir \$out
@@ -144,73 +135,99 @@ let
                 echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
                 ";
             };
-          })
+          })) {} variants;
-      ) {} ${serializedTargets};
       drtio-systems = {
-        ${pkgs.lib.optionalString a6p ''
+        af = {
-          ap = {
+          master = "afmaster";
-            master = "apmaster";
           satellites = {
-              "1" = "apsatellite1";
+            "1" = "afsatellite";
-              "2" = "apsatellite2";
           };
         };
-          berkeley3 = {
+        mitll4 = {
-            master = "berkeley3master";
+          master = "mitll4master";
           satellites = {
-              "1" = "berkeley3satellite";
+            "1" = "mitll4satellite";
           };
         };
-          ptb3 = {
+        vlbai = {
-            master = "ptb3master";
+          master = "vlbaimaster";
           satellites = {
-              "1" = "ptb3satellite";
+            "1" = "vlbaisatellite";
           };
         };
-          purdue = {
+        wipm5 = {
-            master = "purduemaster";
+          master = "wipm5master";
           satellites = {
-              "1" = "purduesatellite";
+            "1" = "wipm5satellite";
           };
         };
-          stfc = {
+      } // (pkgs.lib.optionalAttrs (pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") {
-            master = "stfcmaster";
+        bonn1 = {
+          master = "bonn1master";
           satellites = {
-              "1" = "stfcsatellite";
+            "1" = "bonn1satellite";
           };
         };
-          ubirmingham3 = {
+        hw2 = {
-            master = "ubirmingham3master";
+          master = "hw2master";
           satellites = {
-              "1" = "ubirmingham3satellite";
+            "1" = "hw2satellite";
           };
         };
-          wipm7 = {
+      });
-            master = "wipm7master";
-            satellites = {
-              "1" = "wipm7satellite";
-            };
-          };
-        ''}
-      };
       drtio-ddbs = pkgs.lib.attrsets.mapAttrs'
         (system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)
         (pkgs.stdenv.mkDerivation {
           name = "device-db-\''${system}";
-          buildInputs = ddbDeps;
+          buildInputs = [ artiq-fast.artiq ];
           phases = [ "buildPhase" ];
           buildPhase = "
             mkdir \$out
             artiq_ddb_template \
-              \''${pkgs.lib.strings.concatStringsSep " " (pkgs.lib.attrsets.mapAttrsToList (dest: desc: "-s " + dest + " " + (src + "/\''${desc}.json")) crates.satellites) } \
+              \''${pkgs.lib.strings.concatStringsSep " " (pkgs.lib.attrsets.mapAttrsToList (dest: desc: "-s " + dest + " " + src + "/" + desc + ".json") crates.satellites) } \
               \''${src}/\''${crates.master}.json -o \$out/device_db.py
             mkdir \$out/nix-support
             echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
             ";
         })) drtio-systems;
-      extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial pyqtgraph-qt5 artiq; };
+      extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; };
     in
-      artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
+      artiq-fast // generic-kasli // drtio-ddbs // extras // rec {
+        artiq-board-sayma-rtm = artiq-board {
+          target = "sayma";
+          variant = "rtm";
+          buildCommand = "python -m artiq.gateware.targets.sayma_rtm";
+        };
+        artiq-board-sayma-satellite = artiq-board {
+          target = "sayma";
+          variant = "satellite";
+          buildCommand = "python -m artiq.gateware.targets.sayma_amc";
+        };
+        artiq-board-metlino-master = artiq-board {
+          target = "metlino";
+          variant = "master";
+          buildCommand = "python -m artiq.gateware.targets.metlino";
+        };
+        artiq-board-kc705-nist_qc2 = artiq-board {
+          target = "kc705";
+          variant = "nist_qc2";
+        };
+
+        conda-artiq-board-sayma-rtm = conda-artiq-board {
+          target = "sayma";
+          variant = "rtm";
+          boardBinaries = artiq-board-sayma-rtm;
+        };
+        conda-artiq-board-sayma-satellite = conda-artiq-board {
+          target = "sayma";
+          variant = "satellite";
+          boardBinaries = artiq-board-sayma-satellite;
+        };
+        conda-artiq-board-metlino-master = conda-artiq-board {
+          target = "metlino";
+          variant = "master";
+          boardBinaries = artiq-board-metlino-master;
+        };
         conda-artiq-board-kasli-tester = conda-artiq-board {
           target = "kasli";
           variant = "tester";
@@ -221,22 +238,28 @@ let
           variant = "nist_clock";
           boardBinaries = artiq-fast.artiq-board-kc705-nist_clock;
         };
+        conda-artiq-board-kc705-nist_qc2 = conda-artiq-board {
+          target = "kc705";
+          variant = "nist_qc2";
+          boardBinaries = artiq-board-kc705-nist_qc2;
+        };
       }
     EOF
     '';
   pythonDeps = import ./artiq-full/python-deps.nix { inherit pkgs; };
   sipycoManualPackages = import ./artiq-full/sipyco-manual.nix {
     inherit (pkgs) stdenv lib python3Packages texlive texinfo;
-    inherit (import artiq-fast { inherit pkgs; }) sipyco;
+    inherit (import <artiq-fast> { inherit pkgs; }) sipyco;
   };
   artiqManualPackages = import ./artiq-full/artiq-manual.nix {
     inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
     inherit (pythonDeps) sphinxcontrib-wavedrom;
-    inherit artiq-fast;
   };
-  artiq-full = import generatedNix { inherit pkgs; };
+  jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // {
-  exampleUserEnv = import ./artiq-full/example-user-env.nix { inherit pkgs artiq-full; };
+    # This is in the example in the ARTIQ manual - precompile it to speed up
-  jobs = artiq-full // sipycoManualPackages // artiqManualPackages // exampleUserEnv;
+    # installation for users.
+    matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
+  };
 in
   builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs // {
     artiq-full = pkgs.releaseTools.channel {
@@ -244,5 +267,5 @@ in
       src = generatedNix;
       constituents = [];
     };
-    conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs artiq-fast; } { inherit jobs; };
+    conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; };
   }

artiq-full/artiq-board-vivado.nix

@@ -1,125 +0,0 @@
-# Install Vivado in /opt and add to /etc/nixos/configuration.nix:
-#  nix.sandboxPaths = ["/opt"];
-
-{ pkgs
-, vivado ? import ./fast/vivado.nix { inherit pkgs; }
-, board-generated
-, version
-}:
-
-let
-  # Funnelling the source code through a Nix string allows dropping
-  # all dependencies via `unsafeDiscardStringContext`.
-  discardContextFromPath = { name, src }:
-    let
-      packed = pkgs.stdenv.mkDerivation {
-          name = "${name}.nar.base64";
-          buildInputs = [ pkgs.nix ];
-          phases = [ "installPhase" ];
-          installPhase = "nix-store --dump ${src} | base64 -w0 > $out";
-        };
-      unpacked = archive:
-        pkgs.stdenvNoCC.mkDerivation {
-          name = builtins.unsafeDiscardStringContext name;
-
-          phases = [ "installPhase" ];
-          buildInputs = [ pkgs.nix ];
-          installPhase = "base64 -d < ${archive} | nix-store --restore $out";
-        };
-    in
-      unpacked (
-        builtins.toFile "${builtins.unsafeDiscardStringContext name}.nar.base64" (
-          builtins.unsafeDiscardStringContext (
-            builtins.readFile packed
-          ))) ;
-in
-{ target
-, variant
-, extraInstallCommands ? ""
-, ... }:
-let
-  name = "artiq-board-${target}-${variant}-${version}";
-  installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
-
-  generated = board-generated."artiq-board-${target}-${variant}";
-
-  identifierStr = "${version};${variant}";
-  identifiers = import (
-    pkgs.runCommandLocal "${name}-identifiers.nix" {
-      buildInputs = [ pkgs.python3 ];
-    } ''python ${./generate-identifier.py} "${identifierStr}" > $out''
-  );
-
-  # Depends on just Vivado and the generated Bitstream source
-  vivadoCheckpoint = pkgs.stdenvNoCC.mkDerivation {
-    name = builtins.unsafeDiscardStringContext "${name}-vivado-checkpoint";
-
-    src = discardContextFromPath {
-      name = "${name}-gateware";
-      src = "${generated}/gateware";
-    };
-    buildInputs = [ vivado pkgs.nix ];
-    buildPhase = ''
-      vivado -mode batch -source top_route.tcl
-    '';
-
-    installPhase = ''
-      mkdir -p $out
-
-      chmod a+r top_route.dcp
-      cp top_route.dcp $out
-      cp top_bitstream.tcl $out
-    '';
-  };
-
-  vivadoOutput = pkgs.stdenvNoCC.mkDerivation {
-    name = builtins.unsafeDiscardStringContext "${name}-vivado-output";
-    src = vivadoCheckpoint;
-    buildInputs = [ vivado ];
-    buildPhase =
-      ''
-      cat >top.tcl <<EOF
-      open_checkpoint top_route.dcp
-      '' +
-      (pkgs.lib.concatMapStrings ({ cell, init }:
-        ''
-        set_property INIT ${init} [get_cell ${cell}]
-        ''
-      ) identifiers) +
-      ''
-      source "top_bitstream.tcl"
-      EOF
-      vivado -mode batch -source top.tcl
-      '';
-    installPhase = ''
-      TARGET_DIR=$out/${installPath}
-      mkdir -p $TARGET_DIR
-      chmod a+r top.bit
-      cp top.bit $TARGET_DIR/
-    '';
-
-    # temporarily disabled because there is currently always at least one Kasli bitstream
-    # that fails timing and blocks the conda channel.
-    doCheck = false;
-    checkPhase = ''
-      # Search for PCREs in the Vivado output to check for errors
-      check_log() {
-        set +e
-        grep -Pe "$1" vivado.log
-        FOUND=$?
-        set -e
-        if [ $FOUND != 1 ]; then
-          exit 1
-        fi
-      }
-      check_log "\d+ constraint not met\."
-      check_log "Timing constraints are not met\."
-    '';
-  };
-in
-pkgs.python3Packages.toPythonModule (
-  pkgs.buildEnv rec {
-    inherit name;
-    paths = [ generated vivadoOutput ];
-    pathsToLink = [ "/${installPath}" ];
-  })

artiq-full/artiq-manual.nix

@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchgit, git, python3Packages, texlive, texinfo, sphinxcontrib-wavedrom, artiq-fast }:
+{ stdenv, lib, fetchgit, git, python3Packages, texlive, texinfo, sphinxcontrib-wavedrom }:
 
 let
-  artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") { inherit stdenv fetchgit git; };
+  artiqVersion = import <artiq-fast/pkgs/artiq-version.nix> { inherit stdenv fetchgit git; };
 
   isLatexPdfTarget = target: builtins.match "latexpdf.*" target != null;
 
@@ -16,7 +16,7 @@ let
     name = "artiq-manual-${target}-${version}";
     version = artiqVersion;
 
-    src = import (artiq-fast + "/pkgs/artiq-src.nix") { inherit fetchgit; };
+    src = import <artiq-fast/pkgs/artiq-src.nix> { inherit fetchgit; };
     buildInputs = [
       python3Packages.sphinx python3Packages.sphinx_rtd_theme
       python3Packages.sphinx-argparse sphinxcontrib-wavedrom
@@ -26,7 +26,7 @@ let
 
     preBuild = ''
         export VERSIONEER_OVERRIDE=${artiqVersion}
-        export SOURCE_DATE_EPOCH=${import (artiq-fast + "/pkgs/artiq-timestamp.nix") { inherit stdenv fetchgit git; }}
+        export SOURCE_DATE_EPOCH=${import <artiq-fast/pkgs/artiq-timestamp.nix> { inherit stdenv fetchgit git; }}
         cd doc/manual
       '';
     makeFlags = [ target ];

artiq-full/artiq-targets.nix

@@ -1,65 +0,0 @@
-{ pkgs
-, artiqVersion
-, sinaraSystemsSrc
-}:
-
-let
-  jsons =
-    map (jsonFile: builtins.fromJSON (
-      builtins.readFile (sinaraSystemsSrc + "/${jsonFile}")
-    )) (
-      builtins.attrNames (
-        pkgs.lib.filterAttrs (name: type:
-          type != "directory" &&
-          builtins.match ".+\\.json" name != null
-        ) (builtins.readDir sinaraSystemsSrc)
-      )
-    );
-  kasli = builtins.listToAttrs (
-    builtins.map ({ variant, base, ... }: {
-      name = "artiq-board-kasli-${variant}";
-      value = {
-        target = "kasli";
-        inherit variant;
-        src = sinaraSystemsSrc + "/${variant}.json";
-        buildCommand = "python -m artiq.gateware.targets.kasli_generic $src";
-        standalone = base == "standalone";
-      };
-    }) (
-      builtins.filter (json:
-        pkgs.lib.strings.versionAtLeast artiqVersion (
-          if json ? min_artiq_version
-          then json.min_artiq_version
-          else "0"
-        )
-      ) jsons
-    )
-  );
-in
-kasli // {
-  artiq-board-sayma-rtm = {
-    target = "sayma";
-    variant = "rtm";
-    buildCommand = "python -m artiq.gateware.targets.sayma_rtm";
-  };
-  artiq-board-sayma-satellite = {
-    target = "sayma";
-    variant = "satellite";
-    buildCommand = "python -m artiq.gateware.targets.sayma_amc";
-  };
-  artiq-board-metlino-master = {
-    target = "metlino";
-    variant = "master";
-    buildCommand = "python -m artiq.gateware.targets.metlino";
-  };
-  artiq-board-kc705-nist_qc2 = {
-    target = "kc705";
-    variant = "nist_qc2";
-  };
-} // (pkgs.lib.optionalAttrs (pkgs.lib.strings.versionAtLeast artiqVersion "6.0") {
-  artiq-board-sayma-satellite-st = {
-    target = "sayma";
-    variant = "satellite";
-    buildCommand = "python -m artiq.gateware.targets.sayma_amc --jdcg-type syncdds";
-  };
-})

artiq-full/conda-channel.nix

@@ -1,8 +1,8 @@
-{ pkgs, artiq-fast }:
+{ pkgs }:
 { jobs }:
 
 let 
-  condaBuilderEnv = import (artiq-fast + "/conda/builder-env.nix") { inherit pkgs; };
+  condaBuilderEnv = import <artiq-fast/conda/builder-env.nix> { inherit pkgs; };
 in
   pkgs.runCommand "conda-channel" { }
     ''

artiq-full/example-user-env.nix

@@ -1,38 +0,0 @@
-{ pkgs, artiq-full }:
-let
-  matplotlib-qt = (pkgs.python3Packages.matplotlib.override { enableQt = true; });
-in
-{
-  artiq-example-user-env = pkgs.runCommand "artiq-example-user-env" {
-    buildInputs = [
-      (pkgs.python3.withPackages(ps: [
-        artiq-full.artiq
-        artiq-full.artiq-comtools
-        artiq-full.wand
-        artiq-full.flake8-artiq
-        artiq-full.lda
-        artiq-full.korad_ka3005p
-        artiq-full.novatech409b
-        artiq-full.thorlabs_tcube
-        artiq-full.artiq-board-kc705-nist_clock
-        artiq-full.artiq-board-kasli-oregon
-        ps.paramiko
-        ps.pandas
-        ps.numpy
-        ps.scipy
-        ps.numba
-        ps.bokeh
-        matplotlib-qt
-        # cirq is broken and doesn't build (as of 20.09.3281.06b11191834)
-        #(ps.cirq.override { matplotlib = matplotlib-qt; })
-        # qiskit does not work with matplotlib-qt
-        #ps.qiskit
-      ]))
-
-      artiq-full.openocd
-      pkgs.gtkwave
-      #pkgs.spyder  # broken on 20.03
-      pkgs.R
-    ];
-  } "touch $out";
-}

artiq-full/extras.nix

@@ -1,22 +1,15 @@
-{ pkgs, sipyco, asyncserial, pyqtgraph-qt5, artiq }:
+{ pkgs, sipyco, asyncserial, artiq }:
 let
   condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
   condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
   dualPackage = (
-    { name, version, src, pythonOptions ? {}, condaOptions ? {}, enabled ? true, withManual ? true}:
+    { name, version, src, pythonOptions ? {}, condaOptions ? {}}:
-      pkgs.lib.optionalAttrs enabled ({
+      {
         "${name}" = pkgs.python3Packages.buildPythonPackage ({
           inherit version;
           name = "${name}-${version}";
           inherit src;
         } // pythonOptions);
-        "conda-${name}" = condaBuild {
-          name = "conda-${name}";
-          src = condaFakeSource ({
-            inherit name version src;
-          } // condaOptions);
-        };
-      } // (pkgs.lib.optionalAttrs withManual {
         "${name}-manual-html" = pkgs.stdenv.mkDerivation {
           name = "${name}-manual-html-${version}";
           inherit version src;
@@ -38,7 +31,13 @@ let
               echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
               '';
         };
-      }))
+        "conda-${name}" = condaBuild {
+          name = "conda-${name}";
+          src = condaFakeSource ({
+            inherit name version src;
+          } // condaOptions);
+        };
+      }
     );
   # https://github.com/m-labs/artiq/issues/23
   hidapi = pkgs.hidapi.overrideAttrs (oa: {
@@ -56,8 +55,8 @@ in
     src = pkgs.fetchFromGitHub {
       owner = "m-labs";
       repo = "korad_ka3005p";
-      rev = "a1898409cb188b388ed1cf84e76ca69e9c8a74eb";
+      rev = "a0cfaa5792a211e166d224314c4d0be4881b9b8d";
-      sha256 = "0h20qss70nssqiagc2fx75mravq1pji7rizhag3nq8xrcz2w20nc";
+      sha256 = "1bxzyjyvdhsbm9hj7ypf0vgkd1lvc340bb6lx3wchvh30n7bv9gv";
     };
     pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
     condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
@@ -67,8 +66,8 @@ in
     src = pkgs.fetchFromGitHub {
       owner = "m-labs";
       repo = "novatech409b";
-      rev = "3bd559753972f07d881df66b7c6819afc5436053";
+      rev = "8740b3e7b254e03395135e6bc128bbaca70d4fbb";
-      sha256 = "1g9qv6fn5h7d393mb1v7w8sg6fimqg34blqdj22qnayb4agw1wyg";
+      sha256 = "0mwm434y83y8jb30fpz69z6z3b6sxbc8dv3nw0hq4wc7iginx89d";
     };
     pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
     condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
@@ -78,8 +77,8 @@ in
     src = pkgs.fetchFromGitHub {
       owner = "m-labs";
       repo = "lda";
-      rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970";
+      rev = "6138a94a1116c8f7b40b8bd8bb161f847065aab6";
-      sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn";
+      sha256 = "1009k9pq8wx5zxrljkxr1g95g8q979i7mq3csksdkd3d0v2jvqif";
     };
     pythonOptions = {
       propagatedBuildInputs = [ sipyco ];
@@ -96,8 +95,8 @@ in
     src = pkgs.fetchFromGitHub {
       owner = "m-labs";
       repo = "thorlabs_tcube";
-      rev = "0cb0c15fc7e660a150e193245f5338d48f8b97db";
+      rev = "8b85292d76a69ae72ba8da32b894c87c794574ba";
-      sha256 = "1n4zmjcj2kpd97217y602pq6x8s80w39fgyi6qjmal92aicqdg07";
+      sha256 = "09cy9nhydcwdib21wb0qg1cinvibfbszwgphrmf2ajw5kqpr1d6a";
     };
     pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
     condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
@@ -195,9 +194,6 @@ in
         sha256 = "165j12k9nnrkf2pv0idcv6xhnp1hnsllna4rps2dssnqgjfaw1ss";
       };
       propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp ];
-      # Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses.
-      # Allows subprocesses using python to find all packages you have installed
-      makeWrapperArgs = [ ''--run 'if [ ! -z "$NIX_PYTHONPREFIX" ]; then export PATH=$NIX_PYTHONPREFIX/bin:$PATH;fi' '' ];
     };
     conda-artiq-comtools = condaBuild {
       name = "conda-artiq-comtools";
@@ -207,69 +203,4 @@ in
         dependencies = [ "sipyco" "numpy" "aiohttp >=3" ];
       };
     };
-  } // {
+  }
-    wand = pkgs.python3Packages.buildPythonApplication rec {
-      name = "wand";
-      version = "0.4.dev";
-      src = pkgs.fetchFromGitHub {
-        owner = "OxfordIonTrapGroup";
-        repo = "wand";
-        rev = "0bf1cfef4aa37e5761c20ac8702abec125b45e23";
-        sha256 = "0jfw6w6id7qkx2f6rklrmp13b2hsnvii1qbls60ampx399lcb43g";
-      };
-      patches = [ ./wand-fix-config-dir.patch ];
-      nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
-      dontWrapQtApps = true;
-      postFixup = ''
-        wrapQtApp "$out/bin/wand_gui"
-      '';
-      propagatedBuildInputs = with pkgs.python3Packages; [ artiq quamash numpy scipy influxdb setuptools ];
-    };
-  } // (dualPackage {
-    name = "flake8-artiq";
-    version = "0.1.0";
-    withManual = false;
-    src = pkgs.fetchgit {
-      url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
-      rev = "24bbd3e7f1b3735ac4f40fe54d3666b35a147df0";
-      sha256 = "1rjy1lxcyyq5bak2swfww08vibd1n1l39vrsdb1cg8sl5jpg5in2";
-    };
-    pythonOptions = {
-      propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
-      checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
-    };
-    condaOptions = { dependencies = [ "flake8" ]; };
-  }) // (dualPackage rec {
-    name = "dax";
-    version = "6.4";
-    enabled = builtins.head (builtins.splitVersion version) == builtins.head (builtins.splitVersion artiq.version);
-    withManual = false;
-    src = pkgs.fetchgit {
-      url = "https://gitlab.com/duke-artiq/dax.git";
-      rev = "v${version}";
-      sha256 = "08w0fpyyhk78i1qmych9kq3va02sm5k1z14yhzrfk9hhf5r7ypf8";
-    };
-    pythonOptions = {
-      VERSIONEER_OVERRIDE = version;
-      inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
-      propagatedBuildInputs = [ artiq sipyco ]
-        ++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx ]);
-      checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
-    };
-    condaOptions = { dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" ]; };
-  }) // (dualPackage {
-    name = "dax-applets";
-    version = "0.0.0";
-    withManual = false;
-    src = pkgs.fetchgit {
-      url = "https://gitlab.com/duke-artiq/dax-applets.git";
-      rev = "584ea3e54131242ec1da5365abd21670cdf4a169";
-      sha256 = "0mgjd92yifs24dg4b14vhawx5mdisbx6jqi5xf7fgkijzjp9hvs3";
-    };
-    pythonOptions = {
-      propagatedBuildInputs = [ artiq pyqtgraph-qt5 ]
-        ++ (with pkgs.python3Packages; [ numpy pyqt5 ]);
-      doCheck = false;
-    };
-    condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
-  })

artiq-full/generate-identifier.py

@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# Encodes data like ARTIQ build_soc.py ReprogrammableIdentifier
-
-import sys
-
-if len(sys.argv) != 2:
-    raise ValueError('argument missing')
-
-identifier_str = sys.argv[1]
-contents = list(identifier_str.encode())
-l = len(contents)
-if l > 255:
-    raise ValueError("Identifier string must be 255 characters or less")
-contents.insert(0, l)
-
-f = sys.stdout
-f.write("[\n");
-for i in range(7):
-    init = sum(1 << j if c & (1 << i) else 0 for j, c in enumerate(contents))
-    f.write(
-        '  {{ cell = "identifier_str{}"; init = "256\'h{:X}"; }}\n'.format(i, init)
-    )
-f.write("]\n");

artiq-full/python-deps.nix

@@ -3,18 +3,18 @@
 rec {
   wavedrom = pkgs.python3Packages.buildPythonPackage rec {
     pname = "wavedrom";
-    version = "2.0.3.post2";
+    version = "0.1";
 
     src = pkgs.python3Packages.fetchPypi {
       inherit pname version;
-      sha256 = "13a4086417nv836s2wbj3f4r31gwapbyw5smgl00jsqizwsk96r3";
+      sha256 = "006w683zlmmwcw5xz1n5dwg34ims5jg3gl2700ql4wr0myjz6710";
     };
 
     buildInputs = [ pkgs.python3Packages.setuptools_scm ];
     propagatedBuildInputs = with pkgs.python3Packages; [ svgwrite attrdict ];
     doCheck = false;
 
-    meta = with pkgs.lib; {
+    meta = with pkgs.stdenv.lib; {
       description = "WaveDrom compatible Python module and command line";
       homepage    = "https://pypi.org/project/wavedrom/";
       license     = licenses.mit;
@@ -23,18 +23,18 @@ rec {
 
   sphinxcontrib-wavedrom = pkgs.python3Packages.buildPythonPackage rec {
     pname = "sphinxcontrib-wavedrom";
-    version = "2.1.1";
+    version = "2.0.0";
 
     src = pkgs.python3Packages.fetchPypi {
       inherit pname version;
-      sha256 = "09xq4csdcil2x8mm38yd5k6lfbkazicvm278xnzwbfc9vghkqqs2";
+      sha256 = "0nk36zqq5ipxqx9izz2iazb3iraasanv3nm05bjr21gw42zgkz22";
     };
 
     buildInputs = [ pkgs.python3Packages.setuptools_scm ];
     propagatedBuildInputs = [ wavedrom ] ++ (with pkgs.python3Packages; [ sphinx xcffib cairosvg ]);
     doCheck = false;
 
-    meta = with pkgs.lib; {
+    meta = with pkgs.stdenv.lib; {
       description = "A Sphinx extension that allows including WaveDrom diagrams";
       homepage    = "https://pypi.org/project/sphinxcontrib-wavedrom/";
       license     = licenses.mit;

artiq-full/wand-fix-config-dir.patch

@@ -1,30 +0,0 @@
-diff --git a/wand/tools.py b/wand/tools.py
-index a51dabd..4d5a9d1 100644
---- a/wand/tools.py
-+++ b/wand/tools.py
-@@ -6,6 +6,7 @@ import shutil
- import logging
- 
- from sipyco import pyon
-+from artiq.appdirs import user_config_dir
- import wand
- 
- logger = logging.getLogger(__name__)
-@@ -26,10 +27,15 @@ class LockException(Exception):
-     pass
- 
- 
-+def get_user_config_dir():
-+    dir = user_config_dir("wand", "oitg", "1")
-+    os.makedirs(dir, exist_ok=True)
-+    return dir
-+
-+
- def get_config_path(args, name_suffix=""):
-     config_file = "{}{}_config.pyon".format(args.name, name_suffix)
--    wand_dir = os.path.dirname(wand.__file__)
--    config_path = os.path.join(wand_dir, config_file)
-+    config_path = os.path.join(get_user_config_dir(), config_file)
- 
-     if args.backup_dir == "":
-         backup_path = ""

artiq-zynq.nix

@@ -1,68 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-  artiq-zynq = import <artiq-zynq>;
-  artiq-fast = import <artiq-fast> { inherit pkgs; };
-
-  zynq-rs = import artiq-zynq.zynq-rs;
-  # New zynq-rs versions with Kasli-SoC support have the multiboard "szl" package.
-  # Older versions need the SZL environment variable set to the SZL ELF to be loaded.
-  szlEnv = if zynq-rs ? "szl" then "${zynq-rs.szl}" else "${zynq-rs.zc706-szl}/szl.elf";
-in
-  (
-    builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
-  ) // {
-    gateware-sim = pkgs.lib.hydraJob (pkgs.stdenv.mkDerivation {
-      name = "gateware-sim";
-      buildInputs = [ artiq-fast.migen artiq-fast.migen-axi artiq-fast.artiq ];
-
-      phases = [ "buildPhase" ];
-
-      buildPhase =
-        ''
-        python -m unittest discover ${<artiq-zynq>}/src/gateware -v
-        touch $out
-        '';
-    });
-    zc706-hitl-tests = pkgs.lib.hydraJob (pkgs.stdenv.mkDerivation {
-      name = "zc706-hitl-tests";
-
-      # requires patched Nix
-      __networked = true;
-
-      buildInputs = [
-        pkgs.netcat pkgs.openssh pkgs.rsync artiq-fast.artiq artiq-fast.artiq-netboot
-      ];
-      phases = [ "buildPhase" ];
-
-      buildPhase =
-        ''
-        echo Power cycling board...
-        (echo b; sleep 5; echo B; sleep 5) | nc -N -w6 192.168.1.31 3131
-        echo Power cycle done.
-
-        export USER=hydra
-        export OPENOCD_ZYNQ=${artiq-zynq.zynq-rs}/openocd
-        export SZL=${szlEnv}
-        pushd ${<artiq-zynq>}
-        export NIX_SSHOPTS="-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_rsa"
-        bash ${<artiq-zynq>}/remote_run.sh -h rpi-4 -o "$NIX_SSHOPTS" -d ${artiq-zynq.zc706-nist_qc2-jtag}
-        popd
-
-        echo Waiting for the firmware to boot...
-        sleep 15
-
-        echo Running test kernel...
-        artiq_run --device-db ${<artiq-zynq>}/examples/device_db.py ${<artiq-zynq>}/examples/mandelbrot.py
-
-        echo Running ARTIQ unit tests...
-        ARTIQ_ROOT=${<artiq-zynq>}/examples python -m unittest discover artiq.test.coredevice -v
-
-        touch $out
-
-        echo Completed
-
-        (echo b; sleep 5) | nc -N -w6 192.168.1.31 3131
-        echo Board powered off
-        '';
-    });
-  }

gluelogic/default.nix

@@ -1,11 +1,10 @@
 { pkgs ? import <nixpkgs> {} }:
 let
-  artiqpkgs = import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) lib fetchgit fetchFromGitHub python3Packages; misoc-new = true; };
+  artiqpkgs = import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchFromGitHub python3Packages; };
   ise = import ./ise.nix { inherit pkgs; };
-  vivado = import ../artiq-fast/vivado.nix { inherit pkgs; };
   buildUrukulCpld = {version, src}: pkgs.stdenv.mkDerivation {
-    pname = "urukul-cpld";
+    name = "urukul-cpld-${version}";
-    inherit src version;
+    inherit src;
     buildInputs = [(pkgs.python3.withPackages(ps: [artiqpkgs.migen]))] ++ (builtins.attrValues ise);
     phases = ["buildPhase" "installPhase"];
     buildPhase = "python $src/urukul_impl.py";
@@ -17,8 +16,8 @@ let
       '';
   };
   buildMirnyCpld = {version, src}: pkgs.stdenv.mkDerivation {
-    pname = "mirny-cpld";
+    name = "mirny-cpld-${version}";
-    inherit src version;
+    inherit src;
     buildInputs = [(pkgs.python3.withPackages(ps: [artiqpkgs.migen]))] ++ (builtins.attrValues ise);
     phases = ["buildPhase" "installPhase"];
     buildPhase = "python $src/mirny_impl.py";
@@ -79,27 +78,4 @@ in
         echo file binary-dist $out/fastino.bin >> $out/nix-support/hydra-build-products
         '';
     };
-    phaser-fpga = pkgs.stdenv.mkDerivation {
-      name = "phaser-fpga";
-      src = <phaserSrc>;
-      patchPhase = ''
-        substituteInPlace phaser.py \
-          --replace "source ../load.tcl" \
-                    ""
-      '';
-
-      buildInputs = [ (pkgs.python3.withPackages(ps: [ artiqpkgs.migen artiqpkgs.misoc ])) ] ++ [ vivado ];
-      buildPhase = "python phaser.py";
-      installPhase =
-        ''
-        mkdir -p $out $out/nix-support
-        cp build/phaser.bit $out
-        echo file binary-dist $out/phaser.bit >> $out/nix-support/hydra-build-products
-        '';
-      dontFixup = true;
-
-      doCheck = true;
-      checkInputs = [ pkgs.python3Packages.pytest ];
-      checkPhase = "pytest";
-    };
   }

hydra/artiq.json

@@ -1,233 +1,16 @@
 {
-    "fast-beta": {
     "enabled": 1,
-        "hidden": false,
+    "hidden": true,
-        "description": "Core ARTIQ packages to build fast for CI purposes (beta version)",
+    "description": "js",
     "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-fast.nix",
+    "nixexprpath": "hydra/artiq.nix",
     "checkinterval": 300,
     "schedulingshares": 10,
     "enableemail": false,
     "emailoverride": "",
     "keepnr": 10,
     "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
+        "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+        "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
-            "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
-        }
-    },
-    "board-generated-beta": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Generated code for ARTIQ boards (beta version)",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-board-generated",
-        "checkinterval": 14400,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
-            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }
-        }
-    },
-    "full-beta": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Full set of ARTIQ packages (beta version)",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-full.nix",
-        "checkinterval": 86400,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "a6p": { "type": "boolean", "value": "true" },
-            "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false }
-        }
-    },
-
-    "fast": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Core ARTIQ packages to build fast for CI purposes",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-fast.nix",
-        "checkinterval": 300,
-        "schedulingshares": 10,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-6 1", "emailresponsible": false }
-        }
-    },
-    "board-generated": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Generated code for ARTIQ boards",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-board-generated",
-        "checkinterval": 14400,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
-            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
-        }
-    },
-    "full": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Full set of ARTIQ packages",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-full.nix",
-        "checkinterval": 86400,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "a6p": { "type": "boolean", "value": "true" },
-            "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false }
-        }
-    },
-
-    "fast-legacy": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Core ARTIQ packages to build fast for CI purposes (legacy version)",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-fast.nix",
-        "checkinterval": 300,
-        "schedulingshares": 10,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
-        }
-    },
-    "full-legacy": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Full set of ARTIQ packages (legacy version)",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-full.nix",
-        "checkinterval": 86400,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
-            "a6p": { "type": "boolean", "value": "false" },
-            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }
-        }
-    },
-
-    "gluelogic": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Glue logic gateware for Sinara devices",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "gluelogic.nix",
-        "checkinterval": 172800,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "urukulSrc": { "type": "git", "value": "git://github.com/quartiq/urukul", "emailresponsible": false },
-            "mirnySrc": { "type": "git", "value": "git://github.com/quartiq/mirny", "emailresponsible": false },
-            "fastinoSrc": { "type": "git", "value": "git://github.com/quartiq/fastino", "emailresponsible": false },
-            "phaserSrc": { "type": "git", "value": "git://github.com/quartiq/phaser", "emailresponsible": false }
-        }
-    },
-
-    "zynq-rs": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "Bare-metal Rust on Zynq-7000",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "zynq-rs.nix",
-        "checkinterval": 300,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "zynq-rs": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zynq-rs.git", "emailresponsible": false },
-
-            "gitea_repo_name": { "value": "zynq-rs", "type": "string" },
-            "gitea_repo_owner": { "value": "M-Labs", "type": "string" },
-            "gitea_status_repo": { "value": "zynq-rs", "type": "string" }
-        }
-    },
-    "zynq-beta": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "ARTIQ on Zynq-7000 (beta version)",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-zynq.nix",
-        "checkinterval": 300,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false },
-            "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false },
-
-            "gitea_repo_name": { "value": "artiq-zynq", "type": "string" },
-            "gitea_repo_owner": { "value": "M-Labs", "type": "string" },
-            "gitea_status_repo": { "value": "artiq-zynq", "type": "string" }
-        }
-    },
-    "zynq": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "ARTIQ on Zynq-7000",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "artiq-zynq.nix",
-        "checkinterval": 300,
-        "schedulingshares": 1,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false },
-            "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git release-6", "emailresponsible": false },
-
-            "gitea_repo_name": { "value": "artiq-zynq", "type": "string" },
-            "gitea_repo_owner": { "value": "M-Labs", "type": "string" },
-            "gitea_status_repo": { "value": "artiq-zynq", "type": "string" }
-        }
     }
 }

hydra/artiq.nix

@@ -0,0 +1,119 @@
+{ pkgs ? import <nixpkgs> {}}:
+{
+  jobsets = pkgs.runCommand "spec.json" {}
+    ''
+    cat > $out << EOF
+    {
+        "fast-beta": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Core ARTIQ packages to build fast for CI purposes (beta version)",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "artiq-fast.nix",
+            "checkinterval": 300,
+            "schedulingshares": 10,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
+            }
+        },
+        "full-beta": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Full set of ARTIQ packages (beta version)",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "artiq-full.nix",
+            "checkinterval": 86400,
+            "schedulingshares": 1,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
+                "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }
+            }
+        },
+        "fast": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Core ARTIQ packages to build fast for CI purposes",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "artiq-fast.nix",
+            "checkinterval": 300,
+            "schedulingshares": 10,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
+            }
+        },
+        "full": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Full set of ARTIQ packages",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "artiq-full.nix",
+            "checkinterval": 86400,
+            "schedulingshares": 1,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
+                "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
+            }
+        },
+        "gluelogic": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Glue logic gateware for Sinara devices",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "gluelogic.nix",
+            "checkinterval": 172800,
+            "schedulingshares": 1,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "urukulSrc": { "type": "git", "value": "git://github.com/quartiq/urukul", "emailresponsible": false },
+                "mirnySrc": { "type": "git", "value": "git://github.com/quartiq/mirny", "emailresponsible": false },
+                "fastinoSrc": { "type": "git", "value": "git://github.com/quartiq/fastino", "emailresponsible": false }
+            }
+        },
+        "zynq": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "ARTIQ on the Zynq-based ZC706 board",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "zynq.nix",
+            "checkinterval": 300,
+            "schedulingshares": 1,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla", "emailresponsible": false },
+                "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false },
+                "zc706": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zc706.git", "emailresponsible": false },
+                "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }
+            }
+        }
+    }
+    EOF
+    '';
+}

hydra/fpga.json

@@ -0,0 +1,16 @@
+{
+    "enabled": 1,
+    "hidden": true,
+    "description": "js",
+    "nixexprinput": "nixScripts",
+    "nixexprpath": "hydra/fpga.nix",
+    "checkinterval": 300,
+    "schedulingshares": 10,
+    "enableemail": false,
+    "emailoverride": "",
+    "keepnr": 10,
+    "inputs": {
+        "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
+        "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
+    }
+}

hydra/fpga.nix

@@ -0,0 +1,26 @@
+{ pkgs ? import <nixpkgs> {}}:
+{
+  jobsets = pkgs.runCommand "spec.json" {}
+    ''
+    cat > $out << EOF
+    {
+        "heavyx": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "HeavyX SoC toolkit experiment",
+            "nixexprinput": "heavyx",
+            "nixexprpath": "release.nix",
+            "checkinterval": 300,
+            "schedulingshares": 10,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
+                "heavyx": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/HeavyX.git", "emailresponsible": false }
+            }
+        }
+    }
+    EOF
+    '';
+}

hydra/mcu.json

@@ -1,23 +0,0 @@
-{
-    "mcu": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "MCU firmware",
-        "nixexprinput": "nixScripts",
-        "nixexprpath": "mcu.nix",
-        "checkinterval": 300,
-        "schedulingshares": 10,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 10,
-        "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
-            "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-            "stabilizerSrc": { "type": "git", "value": "git://github.com/HarryMakes/stabilizer.git pre-mqtt 1", "emailresponsible": false },
-            "thermostatSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/thermostat.git", "emailresponsible": false },
-            "humpbackDdsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/humpback-dds.git", "emailresponsible": false },
-            "saymaMmcSrc": { "type": "git", "value": "git://github.com/sinara-hw/openMMC sayma-devel", "emailresponsible": false }
-        }
-    }
-}

hydra/stm32.json

@@ -0,0 +1,16 @@
+{
+    "enabled": 1,
+    "hidden": true,
+    "description": "js",
+    "nixexprinput": "nixScripts",
+    "nixexprpath": "hydra/stm32.nix",
+    "checkinterval": 300,
+    "schedulingshares": 10,
+    "enableemail": false,
+    "emailoverride": "",
+    "keepnr": 10,
+    "inputs": {
+        "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+        "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
+    }
+}

hydra/stm32.nix

@@ -0,0 +1,29 @@
+{ pkgs ? import <nixpkgs> {}}:
+{
+  jobsets = pkgs.runCommand "spec.json" {}
+    ''
+    cat > $out << EOF
+    {
+        "stm32": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "STM32 firmware",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "stm32.nix",
+            "checkinterval": 300,
+            "schedulingshares": 10,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "stabilizerSrc": { "type": "git", "value": "git://github.com/quartiq/stabilizer.git", "emailresponsible": false },
+                "thermostatSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/thermostat.git", "emailresponsible": false }
+            }
+        }
+    }
+    EOF
+    '';
+}

hydra/web.json

@@ -1,19 +1,16 @@
 {
-    "web": {
     "enabled": 1,
-        "hidden": false,
+    "hidden": true,
-        "description": "M-Labs website",
+    "description": "js",
     "nixexprinput": "nixScripts",
-        "nixexprpath": "web.nix",
+    "nixexprpath": "hydra/web.nix",
     "checkinterval": 300,
     "schedulingshares": 10,
     "enableemail": false,
     "emailoverride": "",
     "keepnr": 10,
     "inputs": {
-            "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
+        "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
-            "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+        "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
-            "webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false }
-        }
     }
 }

hydra/web.nix

@@ -0,0 +1,27 @@
+{ pkgs ? import <nixpkgs> {}}:
+{
+  jobsets = pkgs.runCommand "spec.json" {}
+    ''
+    cat > $out << EOF
+    {
+        "web": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "M-Labs website",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "web.nix",
+            "checkinterval": 300,
+            "schedulingshares": 10,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false }
+            }
+        }
+    }
+    EOF
+    '';
+}

mcu.nix

@@ -1,8 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-let
-  jobs = import ./mcu/default.nix {
-    mozillaOverlay = import <mozillaOverlay>;
-  };
-in
-  builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs

mcu/default.nix

@@ -1,119 +0,0 @@
-{ # Use master branch of the overlay by default
-  mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
-  rustManifest ? ./channel-rust-nightly.toml
-}:
-
-let
-  pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
-  rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
-    inherit rustManifest;
-  });
-  buildStm32Firmware = { name, src, cargoDepsName ? name, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "", doCheck ? true, binaryName ? name, extraCargoBuildArgs ? "" }:
-    let
-      cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''
-        cp "${src}/cargosha256.nix" $out
-        '';
-    in
-      rustPlatform.buildRustPackage rec {
-        inherit name cargoDepsName;
-        version = "0.0.0";
-
-        inherit src;
-        cargoSha256 = (import cargoSha256Drv);
-
-        inherit patchPhase;
-        nativeBuildInputs = [ pkgs.llvm ] ++ extraNativeBuildInputs;
-        buildPhase = ''
-          export CARGO_HOME=$(mktemp -d cargo-home.XXX)
-          cargo build --release --bin ${binaryName} ${extraCargoBuildArgs}
-        '';
-
-        inherit checkPhase doCheck;
-        # binaryName defaults to the `name` arg (i.e. the Rust package name);
-        # it is used as the Cargo binary filename
-        installPhase = ''
-          mkdir -p $out $out/nix-support
-          cp target/thumbv7em-none-eabihf/release/${binaryName} $out/${name}.elf
-          echo file binary-dist $out/${name}.elf >> $out/nix-support/hydra-build-products
-          llvm-objcopy -O binary target/thumbv7em-none-eabihf/release/${binaryName} $out/${name}.bin
-          echo file binary-dist $out/${name}.bin >> $out/nix-support/hydra-build-products
-        '';
-
-        dontFixup = true;
-      };
-  migen = (import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) lib fetchgit fetchFromGitHub python3Packages; misoc-new = true; }).migen;
-in
-  pkgs.lib.attrsets.mapAttrs'
-    (name: value: pkgs.lib.attrsets.nameValuePair ("stabilizer-" + name)
-    (buildStm32Firmware ({
-      name = "stabilizer-" + name;
-      # If binaryName is not specified, use the attribute name as binaryName by default.
-      binaryName = name;
-      cargoDepsName = "stabilizer";
-      src = <stabilizerSrc>;
-      patchPhase = ''
-        substituteInPlace src/hardware/configuration.rs \
-          --replace "IpAddress::v4(10, 34, 16, 103)" \
-                    "IpAddress::v4(192, 168, 1, 76)" \
-          --replace "Ipv4Address::new(10, 34, 16, 1)" \
-                    "Ipv4Address::new(192, 168, 1, 1)"
-      '';
-      doCheck = false;
-    } // value))) {
-      dual-iir = {};
-      dual-iir-pounder_v1_1 = {
-        binaryName = "dual-iir";
-        extraCargoBuildArgs = "--features pounder_v1_1";
-      };
-      lockin-external = {};
-      lockin-external-pounder_v1_1 = {
-        binaryName = "lockin-external";
-        extraCargoBuildArgs = "--features pounder_v1_1";
-      };
-      lockin-internal = {};
-      lockin-internal-pounder_v1_1 = {
-        binaryName = "lockin-internal";
-        extraCargoBuildArgs = "--features pounder_v1_1";
-      };
-    } //
-  {
-    thermostat = buildStm32Firmware {
-      name = "thermostat";
-      src = <thermostatSrc>;
-      checkPhase = ''
-        cargo test --target=${pkgs.rust.toRustTarget pkgs.stdenv.targetPlatform}
-      '';
-    };
-    humpback-dds = buildStm32Firmware {
-      name = "humpback-dds";
-      src = <humpbackDdsSrc>;
-      extraNativeBuildInputs = [
-        (pkgs.python3.withPackages(ps: [ migen ]))
-        pkgs.yosys
-        pkgs.nextpnr
-        pkgs.icestorm
-      ];
-    };
-    # openMMC build system breaks if host compiler is not available, so do not use stdenvNoCC here
-    sayma-mmc = pkgs.stdenv.mkDerivation {
-      name = "sayma-mmc";
-      src = <saymaMmcSrc>;
-      phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-      nativeBuildInputs = [ pkgs.cmake pkgs.gcc-arm-embedded ];
-      buildPhase =
-        ''
-        mkdir build
-        cd build
-        cmake .. -DBOARD=sayma -DBOARD_RTM=sayma -DVERSION= -DTARGET_CONTROLLER=LPC1776 -DCMAKE_BUILD_TYPE=Debug
-        make
-        '';
-      installPhase =
-        ''
-        mkdir $out
-        cp out/* $out
-        mkdir -p $out $out/nix-support
-        echo file binary-dist $out/openMMC.axf >> $out/nix-support/hydra-build-products
-        echo file binary-dist $out/openMMC.bin >> $out/nix-support/hydra-build-products
-        '';
-    };
-  }

stm32.nix

@@ -0,0 +1,9 @@
+{ pkgs ? import <nixpkgs> {}, rustManifest ? ./stm32/channel-rust-nightly.toml }:
+
+let
+  jobs = import ./stm32/default.nix {
+    inherit rustManifest;
+    mozillaOverlay = import <mozillaOverlay>;
+  };
+in
+  builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs

stm32/default.nix

@@ -0,0 +1,50 @@
+{ # Use master branch of the overlay by default
+  mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
+  rustManifest ? builtins.fetchurl "https://static.rust-lang.org/dist/channel-rust-nightly.toml"
+}:
+
+let
+  pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
+  rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
+    inherit rustManifest;
+  });
+  buildStm32Firmware = { name, src, patchPhase ? "" }:
+    let
+      cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''cp "${src}/cargosha256.nix" $out'';
+    in
+      rustPlatform.buildRustPackage rec {
+        inherit name;
+        version = "0.0.0";
+
+        inherit src;
+        cargoSha256 = (import cargoSha256Drv);
+
+        inherit patchPhase;
+        buildPhase = ''
+          export CARGO_HOME=$(mktemp -d cargo-home.XXX)
+          cargo build --release
+        '';
+
+        doCheck = false;
+        installPhase = ''
+          mkdir -p $out $out/nix-support
+          cp target/thumbv7em-none-eabihf/release/${name} $out/${name}.elf
+          echo file binary-dist $out/${name}.elf >> $out/nix-support/hydra-build-products
+        '';
+      };
+in
+  {
+    stabilizer = buildStm32Firmware {
+      name = "stabilizer";
+      src = <stabilizerSrc>;
+      patchPhase = ''
+        substituteInPlace src/main.rs \
+          --replace "let local_addr = net::wire::IpAddress::v4(10, 0, 16, 99);" \
+                    "let local_addr = net::wire::IpAddress::v4(192, 168, 1, 76);"
+      '';
+    };
+    thermostat = buildStm32Firmware {
+      name = "thermostat";
+      src = <thermostatSrc>;
+    };
+  }

zynq-rs.nix

@@ -1,7 +0,0 @@
-let
-  pkgs = import <nixpkgs> {};
-  zynq-rs = import <zynq-rs>;
-in
-  (
-    builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs
-  )

zynq.nix

@@ -0,0 +1,59 @@
+let
+  pkgs = import <nixpkgs> {};
+  zc706 = import <zc706> { mozillaOverlay = import <mozillaOverlay>; };
+  artiq-zynq = import <artiq-zynq> { mozillaOverlay = import <mozillaOverlay>; };
+  artiq-fast = import <artiq-fast> { inherit pkgs; };
+  addBuildProducts = drv: drv.overrideAttrs (oldAttrs: {
+      installPhase = ''
+        ${oldAttrs.installPhase}
+        mkdir -p $out/nix-support
+        for f in $out/*.elf ; do
+          echo file binary-dist $f >> $out/nix-support/hydra-build-products
+        done
+      '';
+    });
+in
+  (
+    builtins.mapAttrs (name: drv:
+      pkgs.lib.hydraJob (
+        addBuildProducts drv
+      )
+    ) zc706.zc706
+  ) // (
+    builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
+  ) // {
+    zc706-hitl-tests = pkgs.lib.hydraJob (pkgs.stdenv.mkDerivation {
+      name = "zc706-hitl-tests";
+
+      # requires patched Nix
+      __networked = true;
+
+      buildInputs = [
+        pkgs.netcat pkgs.openssh pkgs.rsync artiq-fast.artiq
+      ];
+      phases = [ "buildPhase" ];
+
+      buildPhase =
+        ''
+        echo Power cycling board...
+        (echo b; sleep 5; echo B) | nc -N 192.168.1.31 3131
+        sleep 5
+        echo Power cycle done.
+
+        export USER=hydra
+        pushd ${<artiq-zynq>}
+        bash ${<artiq-zynq>}/remote_run.sh -h rpi-4 -o "-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_rsa" -d ${artiq-zynq.zc706-simple-jtag}
+        popd
+
+        echo Waiting for the firmware to boot...
+        sleep 15
+
+        echo Running test kernel...
+        artiq_run --device-db ${<artiq-zynq>}/examples/device_db.py ${<artiq-zynq>}/examples/mandelbrot.py
+
+        touch $out
+
+        echo Completed
+        '';
+    });
+  }