Navigation Menu

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

Jump to bottom

[20.09]: python3Packages.nmigen: fix build #97624

Merged
merged 1 commit into from Sep 10, 2020
Merged

[20.09]: python3Packages.nmigen: fix build #97624

merged 1 commit into from Sep 10, 2020

Conversation

drewrisinger
Copy link
Contributor

Motivation for this change

Fixes python3Packages.nmigen build on release-20.09 branch.

Backport of #97617
ZHF: #97479

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.

@ofborg ofborg bot requested a review from emilazy September 10, 2020 04:35
@risicle
Copy link
Contributor

risicle commented Sep 10, 2020

Slight problem: the commit you've referenced in the cherry-pick, 275718d, isn't the final commit that made it into master. Whoever merged it into master must have done a rebase-merge. Could you fix this please? Otherwise the commit you're referring to will be garbage collected by everything and will cease to exist.

@drewrisinger
python3Packages.nmigen: fix build
f6b7a43 
Tried to debug failure & traced it to subprocess.Popen calling fork_exec()
with a bad path, but couldn't reproduce error from manual debugging
using ``nix-shell``.

Bad path meaning that most paths were of form /nix/store/.../bin/sby,
but one path was "sby" only. That's my only guess as to what would
be causing this failure.

(cherry picked from commit b03c729)
@drewrisinger
Copy link
Contributor Author

@risicle I think I fixed it. Not exactly sure how to check this/how you saw it.

@jonringer
Copy link
Contributor

Whoever merged it into master must have done a rebase-merge.

I'm not a big fan of merge commits, so I prefer rebase-merge. Git history looks a lot nicer

@jonringer
Copy link
Contributor

Not exactly sure how to check this/how you saw it.

If you select the commit referenced by cherry-pick, it will mention "this commit doesn't exist"

jonringer
jonringer approved these changes Sep 10, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 97624 1

8 packages built:
  • glasgow (python38Packages.glasgow)
  • python37Packages.glasgow
  • python37Packages.nmigen
  • python37Packages.nmigen-boards
  • python37Packages.nmigen-soc
  • python38Packages.nmigen
  • python38Packages.nmigen-boards
  • python38Packages.nmigen-soc

@jonringer jonringer merged commit b6a1ccd into NixOS:release-20.09 Sep 10, 2020
@drewrisinger drewrisinger deleted the zhf/nmigen-20.09 branch September 11, 2020 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@emilazy emilazy emilazy approved these changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@drewrisinger @risicle @jonringer @emilazy