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

util-linux: 2.35.2 -> 2.36 #96040

Merged
merged 1 commit into from Aug 24, 2020
Merged

util-linux: 2.35.2 -> 2.36 #96040

merged 1 commit into from Aug 24, 2020

Conversation

baloo
Copy link
Member

@baloo baloo commented Aug 22, 2020 •
edited

Motivation for this change

This also happen to fix compilation on musl (static).

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.

@baloo baloo mentioned this pull request Aug 22, 2020
Closed
10 tasks
jtojnar
jtojnar approved these changes Aug 22, 2020
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Scanned through the release notes and did not notice anything suspicious: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/Documentation/releases/v2.36-ReleaseNotes?h=v2.36

@jtojnar jtojnar changed the base branch from master to staging August 22, 2020 23:59
@jtojnar jtojnar changed the base branch from staging to master August 22, 2020 23:59
jonringer
jonringer reviewed Aug 23, 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.

since this change causes over 5000 rebuilds, do you mind targeting the staging branch

git rebase --onto=staging HEAD~1
git push .. ... --force

then change the base branch in the github PR from master -> staging

See https://nixos.org/nixpkgs/manual/#submitting-changes-staging-branch for more details on staging branch

@jtojnar jtojnar changed the base branch from master to staging August 23, 2020 14:52
@jtojnar
Copy link
Contributor

jtojnar commented Aug 23, 2020

Solved that by merging master → staging-next → staging.

@FRidh FRidh merged commit 68c7c5a into NixOS:staging Aug 24, 2020
@FRidh
Copy link
Member

FRidh commented Aug 24, 2020

Duplicate of #94688.

@FRidh FRidh mentioned this pull request Aug 24, 2020
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@jtojnar jtojnar jtojnar approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@baloo @jtojnar @FRidh @jonringer