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

darwin.adv_cmds: add locale data #347642

Closed
wants to merge 2 commits into from
Closed

darwin.adv_cmds: add locale data #347642

wants to merge 2 commits into from

Conversation

reckenrode
Copy link
Contributor

This is a follow up to #346043 to add the missing locale data. It’s not exactly the same as the data used on macOS, but it’s close. This is being done separately in case the PR is rejected.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@reckenrode
darwin.adv_cmds: add locale data
92565df 
The locale data used on macOS has not been included in a source release
since adv_cmds-118. Unfortunately, that data cannot be parsed by the
commands in the current version of adv_cmds, and the data produced by
that version is not compatible with the current libc in macOS.

Since there is not a source of the actual data, this commit adds a
source using the locale data from FreeBSD. It’s close but not identical
to the data used on macOS.
@reckenrode
darwin.stdenv: propagate bmake from stage 1 (for adv_cmds)
1683be0
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Oct 10, 2024
@reckenrode reckenrode mentioned this pull request Oct 10, 2024
Merged
52 tasks
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 10, 2024
@reckenrode
Copy link
Contributor Author

Having locales behave like FreeBSD breaks GNU Grep’s tests.

@reckenrode reckenrode closed this Oct 10, 2024
@reckenrode reckenrode deleted the push-vsznprzltuwu branch October 10, 2024 04:30
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Oct 10, 2024
@ofborg ofborg bot requested a review from toonn October 10, 2024 06:50
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 10, 2024
@reckenrode reckenrode mentioned this pull request Oct 10, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@toonn toonn Awaiting requested review from toonn

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@reckenrode