Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FPGA tools #71238

Merged
merged 7 commits into from Oct 19, 2019
Merged

Update FPGA tools #71238

merged 7 commits into from Oct 19, 2019

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Oct 16, 2019

Motivation for this change

nMigen 0.1 is approaching release, so here's another bump of the FOSS FPGA tools. I've also marked the Clash Haskell packages as unbroken, since as of the 1.0 release they seem to compile and work fine here.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff as usual, thanks @emilazy. Let's go ahead and merge -- since our aarch64 builders are the fastest and actually completed, I'll assume things are perfect in every way and nothing could possibly go wrong (if something spooky crops up on say, Darwin, we'll see it in Hydra later)

Comment on lines -41 to -59
checkInputs = [ yosys yices ];

postPatch = let
tool = pkg: name:
if pkg == null then {} else { ${name} = "${pkg}/bin/${name}"; };

# Only FOSS toolchain supported out of the box, sorry!
toolchainOverrides =
tool yosys "yosys" //
tool symbiyosys "sby" //
tool nextpnr "nextpnr-ice40" //
tool nextpnr "nextpnr-ecp5" //
tool icestorm "icepack" //
tool trellis "ecppack";
in ''
substituteInPlace nmigen/_toolchain.py \
--replace 'overrides = {}' \
'overrides = ${builtins.toJSON toolchainOverrides}'
'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

@thoughtpolice thoughtpolice merged commit ce60639 into NixOS:master Oct 19, 2019
@emilazy emilazy deleted the update-fpga-tools branch October 21, 2019 18:48
@emilazy emilazy mentioned this pull request Feb 10, 2020
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants