forked from M-Labs/nix-scripts
Compare commits
5 Commits
b8d4da3004
...
18f39a0868
Author | SHA1 | Date |
---|---|---|
Leon Riesebos | 18f39a0868 | |
Leon Riesebos | a3fd10cef0 | |
Leon Riesebos | a162c7a65e | |
Leon Riesebos | fb0c412bb0 | |
Drew Risinger | 005d911fb7 |
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
|
{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck, fontconfig }:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "artiq";
|
pname = "artiq";
|
||||||
|
@ -23,7 +23,10 @@ python3Packages.buildPythonPackage rec {
|
||||||
|
|
||||||
# Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses.
|
# 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
|
# 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' '' ];
|
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 ];
|
checkInputs = [ binutils-or1k outputcheck ];
|
||||||
checkPhase =
|
checkPhase =
|
||||||
|
|
|
@ -214,7 +214,7 @@ let
|
||||||
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
||||||
";
|
";
|
||||||
})) drtio-systems;
|
})) drtio-systems;
|
||||||
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; };
|
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial pyqtgraph-qt5 artiq; };
|
||||||
in
|
in
|
||||||
artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
|
artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
|
||||||
conda-artiq-board-kasli-tester = conda-artiq-board {
|
conda-artiq-board-kasli-tester = conda-artiq-board {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, sipyco, asyncserial, artiq }:
|
{ pkgs, sipyco, asyncserial, pyqtgraph-qt5, artiq }:
|
||||||
let
|
let
|
||||||
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
||||||
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
||||||
|
@ -231,8 +231,8 @@ in
|
||||||
withManual = false;
|
withManual = false;
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
|
url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
|
||||||
rev = "1e521fe76f8c2adeaec1c6c6301ec9a2bd2c6382";
|
rev = "779e41c8cf3e05dac4b7c2802640eb0442cf65d9";
|
||||||
sha256 = "1w698i1yp1v3sp09i90mcswjk0i3vpfdr7hd73dplk7wjldxrmv8";
|
sha256 = "1vz6m1w1i1xf72wqzl4ahlv9mcxa6zn8wv05s4yq4cph0hk6inn0";
|
||||||
};
|
};
|
||||||
pythonOptions = {
|
pythonOptions = {
|
||||||
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
|
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
|
||||||
|
@ -245,4 +245,47 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
condaOptions = { dependencies = [ "flake8" ]; };
|
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" ]; };
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue