From 5be4588e7da488cc6985adc360ddb97219aadcaf Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 22 Feb 2019 12:54:10 +0800 Subject: [PATCH] move outputcheck to python3, add python3Package lit --- artiq/default.nix | 2 +- artiq/pkgs/python-deps.nix | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/artiq/default.nix b/artiq/default.nix index caf45c9..81c7583 100644 --- a/artiq/default.nix +++ b/artiq/default.nix @@ -32,7 +32,7 @@ let in rec { inherit (rust) rustc; - inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b outputcheck sphinx-argparse wavedrom sphinxcontrib-wavedrom; + inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck sphinx-argparse wavedrom sphinxcontrib-wavedrom; binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {}; llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; }; llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; }; diff --git a/artiq/pkgs/python-deps.nix b/artiq/pkgs/python-deps.nix index c4c266c..93e0d69 100644 --- a/artiq/pkgs/python-deps.nix +++ b/artiq/pkgs/python-deps.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, python, python2Packages, python3Packages }: +{ pkgs, stdenv, fetchFromGitHub, python, python3Packages }: rec { # User dependencies @@ -150,7 +150,27 @@ rec { }; }; - outputcheck = python2Packages.buildPythonApplication rec { + # not using the nixpkgs version because it is Python 2 and an "application" + lit = python3Packages.buildPythonPackage rec { + pname = "lit"; + version = "0.7.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "ecef2833aef7f411cb923dac109c7c9dcc7dbe7cafce0650c1e8d19c243d955f"; + }; + + # Non-standard test suite. Needs custom checkPhase. + doCheck = false; + + meta = with stdenv.lib; { + description = "Portable tool for executing LLVM and Clang style test suites"; + homepage = http://llvm.org/docs/CommandGuide/lit.html; + license = licenses.ncsa; + }; + }; + + outputcheck = python3Packages.buildPythonApplication rec { pname = "outputcheck"; version = "0.4.2";