Skip to content

treewide (Python packages): Use the buildPythonPackage-provided locale specification whenever appropriate#383766

Merged
ShamrockLee merged 19 commits intoNixOS:stagingfrom
ShamrockLee:python-locale-cleanup
Mar 9, 2025
Merged

treewide (Python packages): Use the buildPythonPackage-provided locale specification whenever appropriate#383766
ShamrockLee merged 19 commits intoNixOS:stagingfrom
ShamrockLee:python-locale-cleanup

Conversation

@ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Feb 20, 2025 •
edited
Loading

Use the locale specification provided by buildPythonPackage in commit 1fccd25 whenever appropriate.

For packages that requires custom locale settings during installCheckPhase, this PR ensures that they set it back at the end of the phase.

Continuation of #55826

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Feb 20, 2025
@ShamrockLee ShamrockLee force-pushed the python-locale-cleanup branch 2 times, most recently from 1072b11 to 287490b Compare February 20, 2025 22:44
@ShamrockLee ShamrockLee changed the title python3Packages: Use the buildPythonPackage-provide local specification whenever appropriate (non-staging) python3Packages: Use the buildPythonPackage-provide local specification whenever appropriate Feb 20, 2025
@ShamrockLee ShamrockLee changed the base branch from master to staging February 20, 2025 22:59
@ShamrockLee ShamrockLee force-pushed the python-locale-cleanup branch from 287490b to db6dcee Compare February 20, 2025 22:59
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Feb 20, 2025
@ShamrockLee ShamrockLee force-pushed the python-locale-cleanup branch from db6dcee to 9becfac Compare February 20, 2025 23:08
@ShamrockLee ShamrockLee marked this pull request as ready for review February 20, 2025 23:11
@nix-owners nix-owners bot requested review from Mic92 and zowoq February 20, 2025 23:12
@ShamrockLee ShamrockLee changed the title python3Packages: Use the buildPythonPackage-provide local specification whenever appropriate treewide (Python packages): Use the buildPythonPackage-provide local specification whenever appropriate Feb 20, 2025
@ShamrockLee ShamrockLee mentioned this pull request Feb 20, 2025
Open
13 tasks
@ShamrockLee ShamrockLee mentioned this pull request Mar 3, 2025
Open
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Mar 3, 2025

Maintainer pings:

@ShamrockLee ShamrockLee changed the title treewide (Python packages): Use the buildPythonPackage-provide local specification whenever appropriate treewide (Python packages): Use the buildPythonPackage-provided local specification whenever appropriate Mar 3, 2025
7c6f434c
7c6f434c approved these changes Mar 6, 2025
View reviewed changes
Copy link
Member

@7c6f434c 7c6f434c left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@ShamrockLee ShamrockLee force-pushed the python-locale-cleanup branch from 9becfac to 8d898cf Compare March 7, 2025 16:28
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: pantheon The Pantheon desktop environment labels Mar 7, 2025
ShamrockLee added 18 commits March 8, 2025 00:29
@ShamrockLee
gpodder: Use the buildPythonPackage-provide local specification
e3d6fab 
Also remove glibcLocale from nativeBuildInputs,
without which the package still builds.
@ShamrockLee
buildbotPackages.buildbot: use the locale specification from buildPyt…
cc1e059 
…honApplicaiton

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.reportlab: use the locale specification from buildPyt…
5f65774 
…honPackage

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.pathlib2: use the locale specification from buildPyth…
597b3c6 
…onPackage

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.ephem: use the locale specification from buildPythonP…
b793058 
…ackage
@ShamrockLee
python3Packages.cligj: use the locale specification from buildPythonP…
511673c 
…ackage
@ShamrockLee
python3Packages.pymediainfo: use the locale specification from buildP…
7077d1e 
…ythonPackage

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.pyrect: use the locale specification from buildPython…
a93c0f7 
…Package
@ShamrockLee
python3Packages.pygel: reset locales after checks
ae063b9
@ShamrockLee
python3Packages.gruut: use the locale specification from buildPythonP…
2019f44 
…ackage

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.jieba: use the locale specification from buildPythonP…
5207d05 
…ackage

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.nipype: use the locale specification from buildPython…
a6fa755 
…Package
@ShamrockLee
python3Packages.configparser: use the locale specification from build…
f66830a 
…PythonPackage
@ShamrockLee
python3Packages.python-magic: unset LC_ALL at the end of checks
f2487d1
@ShamrockLee
python3Packages.sympy: use the locale specification from buildPythonP…
46f20b4 
…ackage
@ShamrockLee
python3Packages.pandas: use the locale specification from buildPython…
13475c2 
…Package

Also remove glibcLocale from nativeCheckInputs,
without which the package still builds.
@ShamrockLee
python3Packages.pyopenssl: use the locale specification from buildPyt…
efccb4a 
…honPackage
@ShamrockLee
python3Packages.docutils: use the locale specification from buildPyth…
7c93ee1 
…onPackage
@ShamrockLee ShamrockLee force-pushed the python-locale-cleanup branch from 8d898cf to 7c93ee1 Compare March 7, 2025 16:30
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: pantheon The Pantheon desktop environment 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Mar 7, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 7, 2025
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Mar 7, 2025

Rebased and resolved merge conflicts.

@ShamrockLee ShamrockLee changed the title treewide (Python packages): Use the buildPythonPackage-provided local specification whenever appropriate treewide (Python packages): Use the buildPythonPackage-provided locale specification whenever appropriate Mar 9, 2025
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Mar 9, 2025

There has been a week since the maintainer ping and two weeks since PR creation. Given the approval, I'll merge before further merge conflicts.

@ShamrockLee ShamrockLee merged commit ad67ac4 into NixOS:staging Mar 9, 2025
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ShamrockLee @7c6f434c