artiq-full: update example-user-env

2021-09-12 20:38:46 +08:00 · 2021-09-12 20:38:46 +08:00 · 6bdf39ef1f
commit 6bdf39ef1f
parent 2afb9c94f3
1 changed files with 3 additions and 2 deletions
--- a/artiq-full/example-user-env.nix
+++ b/artiq-full/example-user-env.nix
@ -20,7 +20,8 @@ in
        ps.pandas
        ps.numpy
        ps.scipy
-        ps.numba
+        # our newer llvmlite conflicts with the one in nixpkgs (21.05), reenable after nixpkgs updates llvmlite
+        #ps.numba
        ps.bokeh
        matplotlib-qt
        # cirq is broken and doesn't build (as of 20.09.3281.06b11191834)
@ -31,7 +32,7 @@ in

      artiq-full.openocd
      pkgs.gtkwave
-      #pkgs.spyder  # broken on 20.03
+      pkgs.spyder
      pkgs.R
    ];
  } "touch $out";