diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/nextpnr/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/nextpnr/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 949c70318ace..07d301187a8e 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake -, boost, python3, eigen +, boost, python3, eigen, python3Packages , icestorm, trellis , llvmPackages @@ -14,21 +14,21 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.08.16"; + version = "2021.09.27"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "b37d133c43c45862bd5c550b5d7fffaa8c49b968"; - sha256 = "0qc9d8cay2j5ggn0mgjq484vv7a14na16s9dmp7bqz7r9cn4b98n"; + rev = "9d8d3bdbc48133ff7758c9c5293e5904bc6e5ba7"; + sha256 = "sha256-5Axo8qX2+ATqQ170QqfhRwYfCRQLCKBW1kc89x9XljE="; name = "nextpnr"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr-tests"; rev = "ccc61e5ec7cc04410462ec3196ad467354787afb"; - sha256 = "09a0bhrphr3rsppryrfak4rhziyj8k3s17kgb0vgm0abjiz0jgam"; + sha256 = "sha256-VT0JfpRLgfo2WG+eoMdE0scPM5nKZZ/v1XlkeDNcQCU="; name = "nextpnr-tests"; }) ]; @@ -39,17 +39,18 @@ stdenv.mkDerivation rec { = [ cmake ] ++ (lib.optional enableGui wrapQtAppsHook); buildInputs - = [ boostPython python3 eigen ] + = [ boostPython python3 eigen python3Packages.apycula ] ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); cmakeFlags = [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" - "-DARCH=generic;ice40;ecp5" + "-DARCH=generic;ice40;ecp5;gowin" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" + "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" "-DUSE_OPENMP=ON" # warning: high RAM usage "-DSERIALIZE_CHIPDBS=OFF" @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { patchPhase = with builtins; '' # use PyPy for icestorm if enabled - substituteInPlace ./ice40/family.cmake \ + substituteInPlace ./ice40/CMakeLists.txt \ --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}' ''; @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/nextpnr-generic wrapQtApp $out/bin/nextpnr-ice40 wrapQtApp $out/bin/nextpnr-ecp5 + wrapQtApp $out/bin/nextpnr-gowin ''; meta = with lib; { |