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] instead: 3.3.1 -> 3.3.2; fix compilation #97641

Merged
merged 1 commit into from Sep 13, 2020
Merged

[20.09] instead: 3.3.1 -> 3.3.2; fix compilation #97641

merged 1 commit into from Sep 13, 2020

Conversation

marius851000
Copy link
Contributor

Motivation for this change

ZHF: #97479

backport of #97562

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.

(note: result in the same derivation as #97562 as time of test)

@ofborg ofborg bot requested a review from pSub September 10, 2020 09:03
@risicle
Copy link
Contributor

risicle commented Sep 10, 2020

When you do a cherry-pick, could you use the -xe flags so that we end up with a reference to the original commit in the commit message?

@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

@marius851000
Copy link
Contributor Author

fixed this. Thank

@jonringer
Copy link
Contributor

the referenced commit should be 43d9d1d7d8f558cbaa4ce386a7c3fb9be2b0d9c1which exists on master, the other commit was the one which existed on your fork

@marius851000
Copy link
Contributor Author

done. Thank again

@jonringer jonringer merged commit 2a7ea4b into NixOS:release-20.09 Sep 13, 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

@pSub pSub Awaiting requested review from pSub

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@marius851000 @risicle @jonringer