diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
commit | f21211ebfe21797c6f0444d42ec7cb835c737388 (patch) | |
tree | 816465981f650242d4b22e0f01b912917e7008f8 /pkgs/development/compilers | |
parent | b291f2a9953d48d6edc5c73776db9ba289ccf213 (diff) | |
parent | 12ae04518b004adf949a43125954b99c05189e6f (diff) | |
download | nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.gz nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.bz2 nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.lz nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.xz nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.zst nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/nextpnr/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/sdcc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/yosys/default.nix | 6 |
3 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index c1e01ef77828..357f26cf3141 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchFromGitHub, cmake , boost, python3, eigen , icestorm, trellis +, llvmPackages , enableGui ? true , wrapQtAppsHook , qtbase +, OpenGL ? null }: let @@ -12,13 +14,13 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2019.08.21"; + version = "2019.08.31"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4"; - sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf"; + rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b"; + sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh"; }; nativeBuildInputs @@ -26,7 +28,8 @@ with stdenv; mkDerivation rec { ++ (lib.optional enableGui wrapQtAppsHook); buildInputs = [ boostPython python3 eigen ] - ++ (lib.optional enableGui qtbase); + ++ (lib.optional enableGui qtbase) + ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); enableParallelBuilding = true; cmakeFlags = @@ -39,7 +42,10 @@ with stdenv; mkDerivation rec { "-DSERIALIZE_CHIPDB=OFF" # use PyPy for icestorm if enabled "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" - ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + ] + ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF") + ++ (lib.optional (enableGui && stdenv.isDarwin) + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); # Fix the version number. This is a bit stupid (and fragile) in practice # but works ok. We should probably make this overrideable upstream. diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 1a450af2b941..cdac400b1afd 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://sdcc.sourceforge.net/; license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 467d4e3b49eb..1535c7a7de64 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { pname = "yosys"; - version = "2019.08.21"; + version = "2019.09.01"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4"; - sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw"; + rev = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0"; + sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs"; name = "yosys"; }) |