From 68078d38d8572e11373f0d417cba63d9f7e550f2 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 9 Jun 2020 15:52:36 +0800 Subject: [PATCH] artiq: use nixpkgs levenshtein --- artiq-fast/default.nix | 2 +- artiq-fast/pkgs/artiq.nix | 4 ++-- artiq-fast/pkgs/python-deps.nix | 10 ---------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix index 4415dc8..ae34452 100644 --- a/artiq-fast/default.nix +++ b/artiq-fast/default.nix @@ -18,7 +18,7 @@ let "artiq-board-${board.target}-${board.variant}" = boardBinaries; }) {} boards; 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-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; }; llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {}; diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix index c1d9e14..1ae7a35 100644 --- a/artiq-fast/pkgs/artiq.nix +++ b/artiq-fast/pkgs/artiq.nix @@ -9,8 +9,8 @@ in src = import ./artiq-src.nix { inherit fetchgit; }; preBuild = "export VERSIONEER_OVERRIDE=${version}"; propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ] - ++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 pythonparser ]) - ++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial h5py pyqt5 ]); + ++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ]) + ++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]); checkInputs = [ binutils-or1k outputcheck ]; checkPhase = '' diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix index 69463b7..b0672c1 100644 --- a/artiq-fast/pkgs/python-deps.nix +++ b/artiq-fast/pkgs/python-deps.nix @@ -25,16 +25,6 @@ rec { 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 { name = "pythonparser"; version = "1.3";