diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-24 11:50:58 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-24 11:50:58 +0200 |
commit | 0a874ff2a6dad9d2693f08a733d58f8077f36916 (patch) | |
tree | 80360888241c761769d9a1074fd96b22d7664598 /pkgs/development/compilers | |
parent | 91104b5417275b780f6947b46a5c1bcc0d99f10b (diff) | |
parent | bc00ecedfa709f4fa91d445dd76ecd792cb2c728 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/nextpnr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/yosys/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index dc8f750c56706..5dfefa6122061 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.07.08"; + version = "2020.08.22"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "3cafb16aa634d2bc369077d8d36760d23973a35b"; - sha256 = "0z6q8f2f97jr037d51h097vck9jspidjn0pb5irlj0xdnb5si0js"; + rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508"; + sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 7d645da8b4b18..c3185ca4e0e63 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.07.07"; + version = "2020.08.22"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "000fd08198487cd1d36e65e4470f4b0269c23a2b"; - sha256 = "01s252vwh4g1f4y99nfrkpf6hgvh9k63nz8hvpmjza5z8x6zf4i1"; + rev = "12132b6850747aec99715fdfa3184fe3ebefa015"; + sha256 = "1v6x1y2f3r8vi7pnkgx374rrv02xgmg9yg23f61n7d1v2rd6y5cc"; }; enableParallelBuilding = true; |