From f03d5d52b9a5f1eefa5d78616f57b390e9682704 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 21 Feb 2019 22:32:43 +0800 Subject: [PATCH] package OutputCheck --- artiq/default.nix | 2 +- artiq/pkgs/python-deps.nix | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/artiq/default.nix b/artiq/default.nix index f985d9b..caf45c9 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 sphinx-argparse wavedrom sphinxcontrib-wavedrom; + inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b 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 14f2e90..c4c266c 100644 --- a/artiq/pkgs/python-deps.nix +++ b/artiq/pkgs/python-deps.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, python, python3Packages }: +{ pkgs, stdenv, fetchFromGitHub, python, python2Packages, python3Packages }: rec { # User dependencies @@ -150,6 +150,25 @@ rec { }; }; + outputcheck = python2Packages.buildPythonApplication rec { + pname = "outputcheck"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "stp"; + repo = "OutputCheck"; + rev = "e0f533d3c5af2949349856c711bf4bca50022b48"; + sha256 = "1y27vz6jq6sywas07kz3v01sqjd0sga9yv9w2cksqac3v7wmf2a0"; + }; + prePatch = "echo ${version} > RELEASE-VERSION"; + + meta = with stdenv.lib; { + description = "A tool for checking tool output inspired by LLVM's FileCheck"; + homepage = "https://github.com/stp/OutputCheck"; + license = licenses.bsd3; + }; + }; + # Documentation building dependencies # sphinx-argparse will be included in nixpkgs 19.03