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.

Sign up for GitHub

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] sonic-lineup: 1.0.1 -> 1.1, fix build #98323

Merged
merged 1 commit into from Sep 20, 2020
Merged

[20.09] sonic-lineup: 1.0.1 -> 1.1, fix build #98323

merged 1 commit into from Sep 20, 2020

Conversation

Sohalt
Copy link
Contributor

@Sohalt Sohalt commented Sep 20, 2020

Motivation for this change

backport of 3ebcc76 sonic-lineup: 1.0.1 -> 1.1, fix build

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.

@jonringer
Copy link
Contributor

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@Sohalt
Copy link
Contributor Author

Sohalt commented Sep 20, 2020

Oops, sorry. I forgot about -x

@jonringer
Copy link
Contributor

I think you targeted the merge commit, it should be named:

sonic-lineup: 1.0.1 -> 1.1, fix build

and the hash should be:

60078b46628bd73e57f133b7dc290ae591551dcf

@Sohalt
sonic-lineup: 1.0.1 -> 1.1, fix build
017b5c4 
(cherry picked from commit 60078b4)
@Sohalt
Copy link
Contributor Author

Sohalt commented Sep 20, 2020

Oh, I was looking for that one and didn't see it right before the merge commit, so I somehow assumed the commit got squashed into the merge or something like that 🤦‍♂️
Thanks for clearing things up!
Now it should finally be correct.

jonringer
jonringer approved these changes Sep 20, 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 98323 1

1 package built:
  • sonic-lineup

@jonringer jonringer merged commit 36fe916 into NixOS:release-20.09 Sep 20, 2020
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

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@Sohalt @jonringer