diff options
| author | Emily <vcs@emily.moe> | 2019-10-13 17:28:35 +0100 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2019-10-19 12:26:49 -0500 |
| commit | 94fc232b72f4f8511cf3c037301c67bb0fed7ec8 (patch) | |
| tree | 8f4d8eff2b4372d2b5a3aabd543a690e6753bba0 /pkgs/development/compilers/nextpnr | |
| parent | b97a11643a3d4596d9d92d36d7d2f4ef47eb4cd7 (diff) | |
| download | nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.tar nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.tar.gz nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.tar.bz2 nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.tar.lz nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.tar.xz nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.tar.zst nixpkgs-94fc232b72f4f8511cf3c037301c67bb0fed7ec8.zip | |
nextpnr: 2019.09.28 -> 2019.10.13
Diffstat (limited to 'pkgs/development/compilers/nextpnr')
| -rw-r--r-- | pkgs/development/compilers/nextpnr/default.nix | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index d9f6f9f65dd..f0c1ba14c48 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,15 +14,26 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2019.09.28"; + version = "2019.10.13"; - src = fetchFromGitHub { - owner = "yosyshq"; - repo = "nextpnr"; - rev = "7cd1e0495122847611b17a8d1f007d97a05b288c"; - sha256 = "13y739l92plb22g73jf35pyh3y94b2vq0i65r9c31r2rb7fw4bbl"; - fetchSubmodules = true; - }; + srcs = [ + (fetchFromGitHub { + owner = "YosysHQ"; + repo = "nextpnr"; + rev = "c365dd1cabc3a4308ab9110534918623622c246b"; + sha256 = "1344pyq9xb5y1vxsnfgr488drfjsa6ls1jck0z9hwam6vg55s10r"; + name = "nextpnr"; + }) + (fetchFromGitHub { + owner = "YosysHQ"; + repo = "nextpnr-tests"; + rev = "8f93e7e0f897b1b5da469919c9a43ba28b623b2a"; + sha256 = "0zpd0w49k9l7rs3wmi2v8z5s4l4lad5rprs5l83w13667himpzyc"; + name = "nextpnr-tests"; + }) + ]; + + sourceRoot = "nextpnr"; nativeBuildInputs = [ cmake ] @@ -51,13 +62,17 @@ with stdenv; mkDerivation rec { # but works ok. We should probably make this overrideable upstream. patchPhase = with builtins; '' substituteInPlace ./CMakeLists.txt \ - --replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}' + --replace 'git log -1 --format=%h' 'echo ${substring 0 11 (elemAt srcs 0).rev}' # use PyPy for icestorm if enabled substituteInPlace ./ice40/family.cmake \ --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}' ''; + preBuild = '' + ln -s ../nextpnr-tests tests + ''; + doCheck = true; postFixup = lib.optionalString enableGui '' |