diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-22 13:47:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-22 18:22:22 +0000 |
| commit | 1b9a13c4689af7e088eb7af5589f8c811282846a (patch) | |
| tree | 3ed032953008280fb94ef894c869ff3e2a2f7865 /nixpkgs/pkgs/development/compilers/nextpnr/default.nix | |
| parent | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (diff) | |
| parent | 1412af4b2cfae71d447164097d960d426e9752c0 (diff) | |
| download | nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.gz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.bz2 nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.lz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.xz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.zst nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.zip | |
Merge remote-tracking branch 'channels/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/nextpnr/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/nextpnr/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index d1c0db25351c..d32d3fa67f1d 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/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 |