From 45f46f89017625cb4f90f9991017cc26c5f314d6 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Jan 2021 17:23:19 +0800 Subject: [PATCH] add user environment test --- artiq-full.nix | 8 +++----- artiq-full/example-user-env.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 artiq-full/example-user-env.nix diff --git a/artiq-full.nix b/artiq-full.nix index 5f3e43d..5d6b30f 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -296,11 +296,9 @@ let inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo; inherit (pythonDeps) sphinxcontrib-wavedrom; }; - jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // { - # This is in the example in the ARTIQ manual - precompile it to speed up - # installation for users. - matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; }); - }; + artiq-full = import generatedNix { inherit pkgs; }; + exampleUserEnv = import ./artiq-full/example-user-env.nix { inherit pkgs artiq-full; }; + jobs = artiq-full // sipycoManualPackages // artiqManualPackages // exampleUserEnv; in builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs // { artiq-full = pkgs.releaseTools.channel { diff --git a/artiq-full/example-user-env.nix b/artiq-full/example-user-env.nix new file mode 100644 index 0000000..098c0a7 --- /dev/null +++ b/artiq-full/example-user-env.nix @@ -0,0 +1,32 @@ +{ pkgs, artiq-full }: +{ + 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.lda + artiq-full.korad_ka3005p + artiq-full.novatech409b + artiq-full.thorlabs_tcube + artiq-full.artiq-board-kc705-nist_clock + artiq-full.artiq-board-kasli-nist2 + ps.paramiko + ps.pandas + ps.numpy + ps.scipy + ps.numba + (ps.matplotlib.override { enableQt = true; }) + ps.bokeh + ps.cirq + ps.qiskit + ])) + + artiq-full.openocd + pkgs.gtkwave + pkgs.spyder + pkgs.R + ]; + } "touch $out"; +}