diff --git a/artiq-full/example-user-env.nix b/artiq-full/example-user-env.nix index bedc4f6..b4827c3 100644 --- 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";