fix styling

This commit is contained in:
Harry Ho 2019-10-17 17:35:29 +08:00
parent 9710ebd9d5
commit 5d88fd2aa4
2 changed files with 7 additions and 4 deletions

View File

@ -1,6 +1,6 @@
self: super: self: super:
rec { rec {
yosys = super.yosys.overrideAttrs(oa: rec { yosys = super.yosys.overrideAttrs(oa: rec {
name = "yosys-${version}"; name = "yosys-${version}";
version = "0.9"; version = "0.9";
srcs = [ srcs = [
@ -12,6 +12,9 @@ rec {
name = "yosys"; name = "yosys";
}) })
# NOTE: the version of abc used here is synchronized with
# the one in the yosys Makefile of the version above;
# keep them the same for quality purposes.
(super.fetchFromGitHub { (super.fetchFromGitHub {
owner = "berkeley-abc"; owner = "berkeley-abc";
repo = "abc"; repo = "abc";

View File

@ -5,9 +5,9 @@ let
in in
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ buildInputs = [
hx.binutils-riscv32 hx.binutils-riscv64 hx.gcc-riscv32 hx.gcc-riscv64 pkgs.rustc pkgs.cargo hx.rust-riscv32i-crates hx.binutils-riscv32 hx.binutils-riscv64 hx.gcc-riscv32 hx.gcc-riscv64 pkgs.rustc pkgs.cargo hx.rust-riscv32i-crates
(pkgs.python3.withPackages(ps: [hx.nmigen hx.nmigen-boards hx.heavycomps hx.minerva])) (pkgs.python3.withPackages(ps: [hx.nmigen hx.nmigen-boards hx.heavycomps hx.minerva]))
pkgs.yosys pkgs.yosys
pkgs.nextpnr pkgs.nextpnr
pkgs.trellis pkgs.trellis
pkgs.openocd pkgs.openocd