From 19f124bff35870f0d6cf95802f7a80ba834d0c94 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 23 Aug 2019 18:08:20 +0800 Subject: [PATCH] migen-axi: fix MiSoC identifier core compatibility, enable tests --- artiq-fast/pkgs/python-deps.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix index af1582f..4c6fd1d 100644 --- a/artiq-fast/pkgs/python-deps.nix +++ b/artiq-fast/pkgs/python-deps.nix @@ -216,9 +216,19 @@ rec { sha256 = "19gycn7s32j7zzy064qj2yv9g9jk9kn9z3q0fap2dg308g6d1pjs"; }; - nativeBuildInputs = [ python3Packages.pbr python3Packages.pytest ]; + postPatch = '' + substituteInPlace src/migen_axi/integration/soc_core.py \ + --replace "identifier_mem" "identifier" + substituteInPlace tests/test_integration.py \ + --replace "zedboard.Platform(name=\"soc\", toolchain=\"vivado\")" "zedboard.Platform()" + ''; + + nativeBuildInputs = [ python3Packages.pbr ]; propagatedBuildInputs = [ python3Packages.click python3Packages.numpy python3Packages.toolz ramda migen misoc ]; + checkInputs = [ python3Packages.pytest python3Packages.pytest-flake8 ]; + checkPhase = "pytest"; + preBuild = '' export PBR_VERSION=0.0.1 '';