artiq-fast/pkgs/artiq.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck, fontconfig }:
+{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
 
 python3Packages.buildPythonPackage rec {
   pname = "artiq";
@@ -23,10 +23,7 @@ python3Packages.buildPythonPackage rec {
 
   # 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 = [
+  makeWrapperArgs = [ ''--run 'if [ ! -z "$NIX_PYTHONPREFIX" ]; then export PATH=$NIX_PYTHONPREFIX/bin:$PATH;fi' '' ];
-    ''--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 =

artiq-full.nix

@@ -214,7 +214,7 @@ let
             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 {
         conda-artiq-board-kasli-tester = conda-artiq-board {

artiq-full/extras.nix

@@ -1,4 +1,4 @@
-{ 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; };
@@ -231,8 +231,8 @@ in
     withManual = false;
     src = pkgs.fetchgit {
       url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
-      rev = "779e41c8cf3e05dac4b7c2802640eb0442cf65d9";
+      rev = "1e521fe76f8c2adeaec1c6c6301ec9a2bd2c6382";
-      sha256 = "1vz6m1w1i1xf72wqzl4ahlv9mcxa6zn8wv05s4yq4cph0hk6inn0";
+      sha256 = "1w698i1yp1v3sp09i90mcswjk0i3vpfdr7hd73dplk7wjldxrmv8";
     };
     pythonOptions = {
       propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
@@ -245,47 +245,4 @@ in
         '';
     };
     condaOptions = { dependencies = [ "flake8" ]; };
-  }) // (dualPackage {
-    name = "dax";
-    version = "6.3";
-    withManual = false;
-    src = pkgs.fetchgit {
-      url = "https://gitlab.com/duke-artiq/dax.git";
-      rev = "v${version}";
-      sha256 = "1agxyx2rxylrwc3zyz2czdbfv2sxrx5mrwahm0n7gnn87f32h36v";
-    };
-    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.pytest pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
-      checkPhase =
-        ''
-        pytest
-        mypy
-        flake8
-        '';
-    };
-    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 = "e25f0c83ef246d2913cbd97379b67ac02896745b";
-      sha256 = "0d0fkw27bhd0hky512km6iiiagwkdzw4vxgcd4cjq08nmh72jxv1";
-    };
-    pythonOptions = {
-      propagatedBuildInputs = [ artiq pyqtgraph-qt5 ]
-        ++ (with pkgs.python3Packages; [ numpy pyqt5 ]);
-      checkInputs = [ pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
-      checkPhase =
-        ''
-        mypy
-        flake8
-        '';
-    };
-    condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
   })