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

moreutils: minor packaging improvements #316446

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

uninsane
Copy link
Contributor

@uninsane uninsane commented Jun 1, 2024

Description of changes

  • use perl.withPackages instead of manually wrapping.
  • plumb the docbook via DOCBOOKXSL instead of patching.
  • specify INSTALL_BIN=install instead of upstream's default install -s. this lets the user control stripping (via stdenv's dontStrip option), and notably in a way which is compatible with cross compilation (install -s is not).

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.

- use `perl.withPackages` instead of manually wrapping.
- plumb the docbook via `DOCBOOKXSL` instead of patching.
- specify `INSTALL_BIN=install` instead of upstream's default `install -s`.
  this lets the user control stripping (via stdenv's `dontStrip` option),
  and notably in a way which is compatible with cross compilation
  (`install -s` is not).
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

LGTM

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 4, 2024
@JohnRTitor JohnRTitor merged commit 07a733a into NixOS:master Jul 12, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants