forked from M-Labs/nix-scripts
move outputcheck to python3, add python3Package lit
This commit is contained in:
parent
f03d5d52b9
commit
5be4588e7d
|
@ -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; };
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
Loading…
Reference in New Issue