From a0824ccff7b57d9405796d7c9e55f1e2190a9729 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 13 Aug 2019 16:40:25 -0700
Subject: nextpnr: 2019.04.19 -> 2019.08.10

---
 pkgs/development/compilers/nextpnr/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/compilers')

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index d1c0db25351c..d32d3fa67f1d 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -26,14 +26,14 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  name = "nextpnr-${version}";
-  version = "2019.04.19";
+  pname = "nextpnr";
+  version = "2019.08.10";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "nextpnr";
-    rev    = "5344bc3b65f4e06f983db781e9a82d30b3f1512b";
-    sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a";
+    rev    = "3f26cf50767143e48d29ae691b2a0052c359eb15";
+    sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr";
   };
 
   nativeBuildInputs
@@ -49,6 +49,10 @@ stdenv.mkDerivation rec {
       "-DICEBOX_ROOT=${icestorm}/share/icebox"
       "-DTRELLIS_ROOT=${trellisRoot}/trellis"
       "-DUSE_OPENMP=ON"
+      # warning: high RAM usage
+      "-DSERIALIZE_CHIPDB=OFF"
+      # use PyPy for icestorm if enabled
+      "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
     ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF");
 
   # Fix the version number. This is a bit stupid (and fragile) in practice
-- 
cgit 1.4.1