occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

nix: reorganize .nix files

This commit is contained in:
Sebastien Bourdeauducq 2019-01-01 23:39:38 +08:00
parent e2799803cb
commit 48793b7ecf
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nix/default.nix
View File

@ -10,9 +10,9 @@ let
in rec { in rec {
inherit (rust) cargo rustc; inherit (rust) cargo rustc;
inherit (callPackage ./pkgs/python3Packages.nix {}) migen misoc; inherit (callPackage ./pkgs/python3Packages.nix {}) migen misoc;
binutils-or1k = callPackage ./binutils-or1k.nix {}; binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
llvm-or1k = callPackage ./llvm-or1k.nix { inherit llvm-src; }; llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; };
llvmlite = callPackage ./llvmlite.nix { inherit llvm-or1k; }; llvmlite = callPackage ./pkgs/llvmlite.nix { inherit llvm-or1k; };
artiq = callPackage ./artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite; }; artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite; };
openocd = callPackage ./pkgs/openocd.nix {}; openocd = callPackage ./pkgs/openocd.nix {};
} }

2
nix/artiq.nix → nix/pkgs/artiq.nix
View File

@ -66,7 +66,7 @@ in
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
name = "artiq"; name = "artiq";
src = ./..; src = ./../..;
propagatedBuildInputs = with python3Packages; [ binutils-or1k llvm-or1k llvmlite levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ]; propagatedBuildInputs = with python3Packages; [ binutils-or1k llvm-or1k llvmlite levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {

0
nix/binutils-or1k.nix → nix/pkgs/binutils-or1k.nix
View File

0
nix/llvm-or1k.nix → nix/pkgs/llvm-or1k.nix
View File

0
nix/llvmlite.nix → nix/pkgs/llvmlite.nix
View File