M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

build artiq-comtools

This commit is contained in:
Sebastien Bourdeauducq 2019-11-14 15:22:17 +08:00
parent 91182a37dd
commit 5797648204
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq-fast/conda-artiq-deps.nix
View File

@ -13,7 +13,6 @@
"quamash" "quamash"
"pyqtgraph 0.10.0" "pyqtgraph 0.10.0"
"pygit2" "pygit2"
"aiohttp >=3"
"python-levenshtein" "python-levenshtein"
"sipyco" "sipyco"
] ]

2
artiq-fast/pkgs/artiq.nix
View File

@ -10,7 +10,7 @@ in
preBuild = "export VERSIONEER_OVERRIDE=${version}"; preBuild = "export VERSIONEER_OVERRIDE=${version}";
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ] propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 quamash pythonparser ]) ++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 quamash pythonparser ])
++ (with python3Packages; [ aiohttp pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]); ++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
checkInputs = [ binutils-or1k outputcheck ]; checkInputs = [ binutils-or1k outputcheck ];
checkPhase = checkPhase =
'' ''

4
artiq-fast/pkgs/python-deps.nix
View File

@ -8,8 +8,8 @@ rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "sipyco"; repo = "sipyco";
rev = "5d550bce964a9955546130236be13af2891b090a"; rev = "af20168bd5f5d024f36aee93c377a1ac916a3ac1";
sha256 = "0rn4zj7sz2llph91m2bsm1i27f2gbsnzkj8vbwa8944k23ci19xg"; sha256 = "0q7gyl94808ry6h8nvyhx4vkwvbcpbcxi5xpjp0q3baid5gw59zx";
}; };
propagatedBuildInputs = with python3Packages; [ numpy ]; propagatedBuildInputs = with python3Packages; [ numpy ];
}; };

28
artiq-full/extras.nix
View File

@ -1,5 +1,7 @@
{ pkgs, sipyco, asyncserial, artiq }: { pkgs, sipyco, asyncserial, artiq }:
let let
condaBuild = import ./fast/conda-build.nix { inherit pkgs; };
condaFakeSource = import ./fast/conda-fake-source.nix { inherit pkgs; };
dualPackage = ( dualPackage = (
{ name, version, src, pythonOptions ? {}, condaOptions ? {}}: { name, version, src, pythonOptions ? {}, condaOptions ? {}}:
{ {
@ -29,9 +31,9 @@ let
echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
''; '';
}; };
"conda-${name}" = import ./fast/conda-build.nix { inherit pkgs; } { "conda-${name}" = condaBuild {
name = "conda-${name}"; name = "conda-${name}";
src = import ./fast/conda-fake-source.nix { inherit pkgs; } ({ src = condaFakeSource ({
inherit name version src; inherit name version src;
} // condaOptions); } // condaOptions);
}; };
@ -173,4 +175,24 @@ in
checkPhase = "python -m highfinesse_net.aqctl_highfinesse_net -h"; checkPhase = "python -m highfinesse_net.aqctl_highfinesse_net -h";
}; };
condaOptions = { dependencies = [ "sipyco" ]; }; condaOptions = { dependencies = [ "sipyco" ]; };
}) }) // rec {
artiq-comtools = pkgs.python3Packages.buildPythonPackage rec {
name = "artiq-comtools-${version}";
version = "1.0";
src = pkgs.fetchFromGitHub {
owner = "m-labs";
repo = "artiq-comtools";
rev = "398f6becdaf89ec2e115106778467f9a766a2007";
sha256 = "02i2a1mmzc7jixq4nkbmi1a4c0gk6kmm8bv1dxrka7m56nb9sk9w";
};
propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp ];
};
conda-artiq-comtools = condaBuild {
name = "conda-artiq-comtools";
src = condaFakeSource {
name = "artiq-comtools";
inherit (artiq-comtools) version src;
dependencies = [ "sipyco" "numpy" "aiohttp >=3" ];
};
};
}