forked from M-Labs/nix-scripts
artiq: use nixpkgs levenshtein
This commit is contained in:
parent
b7d872a720
commit
68078d38d8
|
@ -18,7 +18,7 @@ let
|
||||||
"artiq-board-${board.target}-${board.variant}" = boardBinaries;
|
"artiq-board-${board.target}-${board.variant}" = boardBinaries;
|
||||||
}) {} boards;
|
}) {} boards;
|
||||||
mainPackages = rec {
|
mainPackages = rec {
|
||||||
inherit (pythonDeps) sipyco asyncserial levenshtein pythonparser pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
|
inherit (pythonDeps) sipyco asyncserial pythonparser pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
|
||||||
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
||||||
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
||||||
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
||||||
|
|
|
@ -9,8 +9,8 @@ in
|
||||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||||
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 pythonparser ])
|
++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
|
||||||
++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial h5py pyqt5 ]);
|
++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]);
|
||||||
checkInputs = [ binutils-or1k outputcheck ];
|
checkInputs = [ binutils-or1k outputcheck ];
|
||||||
checkPhase =
|
checkPhase =
|
||||||
''
|
''
|
||||||
|
|
|
@ -25,16 +25,6 @@ rec {
|
||||||
propagatedBuildInputs = with python3Packages; [ pyserial ];
|
propagatedBuildInputs = with python3Packages; [ pyserial ];
|
||||||
};
|
};
|
||||||
|
|
||||||
levenshtein = python3Packages.buildPythonPackage rec {
|
|
||||||
name = "levenshtein";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "ztane";
|
|
||||||
repo = "python-Levenshtein";
|
|
||||||
rev = "854e61a05bb8b750e990add96df412cd5448b75e";
|
|
||||||
sha256 = "1yf21kg1g2ivm5a4dx1jra9k0c33np54d0hk5ymnfyc4f6pg386q";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
pythonparser = python3Packages.buildPythonPackage rec {
|
pythonparser = python3Packages.buildPythonPackage rec {
|
||||||
name = "pythonparser";
|
name = "pythonparser";
|
||||||
version = "1.3";
|
version = "1.3";
|
||||||
|
|
Loading…
Reference in New Issue