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.03] Backport of nixpart0 fixes against glibc >= 2.28 #90064

Merged
merged 6 commits into from Jun 15, 2020
Merged

[20.03] Backport of nixpart0 fixes against glibc >= 2.28 #90064

merged 6 commits into from Jun 15, 2020

Conversation

aszlig
Copy link
Member

@aszlig aszlig commented Jun 10, 2020 •
edited

Backport of pull request #89948 by @pbogdan against NixOS 20.03:

Motivation for this change

While AFAICT not used directly in nixpkgs the package is used for provisioning new servers in nixops' Hetzner module.

This PR contains a collection of fixes for the package's dependencies to unblock its build. Closes #86403.

This branch contains the same commits as in #86403 (comment) just rebased onto more recent master.

If accepted I will make a backport PR to 20.03 as well as per the discussion on the linked issue.

/cc @nh2
/cc @kolloch @mkg20001 who might still be interested as well

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: @NixOS/backports

@aszlig aszlig requested a review from pbogdan June 10, 2020 15:00
@aszlig aszlig changed the title Backport of nixpart0 fixes against glibc >= 2.28 [20.03] Backport of nixpart0 fixes against glibc >= 2.28 Jun 10, 2020
@aszlig aszlig added the 8.has: port to stable A PR already has a backport to the stable release. label Jun 10, 2020
@flokli
Copy link
Contributor

flokli commented Jun 10, 2020

This is directed to the wrong branch, should be release-20.03.

@lheckemann lheckemann changed the base branch from nixos-20.03 to release-20.03 June 11, 2020 07:14
@pbogdan
Copy link
Member

pbogdan commented Jun 11, 2020

Would you be able to use git cherry-pick -x for the commits to record where they originated from (https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches)? Otherwise LGTM.

@pbogdan pbogdan requested a review from nh2 June 11, 2020 11:20
@aszlig
Copy link
Member Author

aszlig commented Jun 14, 2020

Would you be able to use git cherry-pick -x for the commits to record where they originated from (https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches)? Otherwise LGTM.

When writing that part of the manual back then, I was referring to single commits only and not merge commits (maybe that should have been made clear). If I'd were to merge this, I'd probably either just cherry-pick the merge commit or merge the branch with a note to the original merge, since cherry-picking with -x would (at least to me) indicate a disjoint set of commits.

However, if you insist I could re-do everything as cherry-picks as well.

@flokli
Copy link
Contributor

flokli commented Jun 14, 2020

Last time I checked, cherry-picking merge commits had a somewhat bad UX.

Currently observed practice in nixpkgs seems to be git cherry-pick -x of the individual commits of the original PR, which seems to be much easier, while retaining pointers to the original PR (commits).

This PR currently doesn't have any reference to the old commits. I'd suggest to git cherry-pick -x the individual commits again, to be consistent with how it's mostly done.

@aszlig
Copy link
Member Author

aszlig commented Jun 14, 2020

Last time I checked, cherry-picking merge commits had a somewhat bad UX.

I beg to differ here, as mentioned in IRC, but to be consistent of how this has been done lately I've changed it accordingly.

@flokli flokli merged commit 927d4e6 into NixOS:release-20.03 Jun 15, 2020
@flokli
Copy link
Contributor

flokli commented Jun 15, 2020

Thanks!

@aszlig aszlig deleted the nixpart0-glibc-fixes branch June 15, 2020 10:17
@nh2
Copy link
Contributor

nh2 commented Jun 15, 2020

Thanks!

@pbogdan pbogdan mentioned this pull request Jun 15, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbogdan pbogdan Awaiting requested review from pbogdan

@nh2 nh2 Awaiting requested review from nh2

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@aszlig @flokli @pbogdan @nh2