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

yosys: use external abc and simplify derivation #79007

Merged
merged 7 commits into from Feb 1, 2020
Merged

Conversation

@flokli
Copy link
Contributor

@flokli flokli commented Feb 1, 2020

Motivation for this change

The yosys derivation currently is very hard to override and more complex than it needs to be.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

cc @heijligen @piegames

@flokli flokli requested review from thoughtpolice, volth and emilazy Feb 1, 2020
flokli added 5 commits Feb 1, 2020
Some consumers of abc-verifier require certain abc versions.
For that reason, expose the exact rev via a passtrhru.
@emilazy
Copy link
Member

@emilazy emilazy commented Feb 1, 2020

yosys is designed to be used with a specific pinned version of ABC, so this isn't a good idea unless the ABC package is going to be kept at that same version.

Edit: Ah, I see there's already a check for that in place. Never mind then!

@flokli
Copy link
Contributor Author

@flokli flokli commented Feb 1, 2020

@emilazy
emilazy approved these changes Feb 1, 2020
# checkPhase defaults to VERBOSE=y, which gets passed down to abc,
# which then does $(VERBOSE)gcc, which then complains about not
# being able to find ygcc. Life is pain.
checkFlags = [ " " ];

This comment has been minimized.

@emilazy

emilazy Feb 1, 2020
Member

Are you sure this is no longer needed? Looks good to me other than that!

This comment has been minimized.

@flokli

flokli Feb 1, 2020
Author Contributor

Well, we don't build abc in here anymore, but pass it in externally. So we don't need to worry about what was being passed to the vendored abc build. Right? ;-)

This comment has been minimized.

@emilazy

emilazy Feb 1, 2020
Member

Right, sorry, seems I haven't yet woken up today >.<

@flokli flokli merged commit 24c739c into NixOS:master Feb 1, 2020
16 checks passed
16 checks passed
abc-verifier, yosys on x86_64-darwin Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
abc-verifier, yosys on aarch64-linux Success
Details
abc-verifier, yosys on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@flokli flokli deleted the flokli:yosys-updates branch Feb 1, 2020
anna328p added a commit to anna328p/nixpkgs that referenced this pull request Feb 2, 2020
yosys: use external abc and simplify derivation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.