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

perlPackages.ConfigIniFiles: Use buildPerlPackage #158021

Merged
merged 1 commit into from
Feb 3, 2022

Conversation

dasJ
Copy link
Member

@dasJ dasJ commented Feb 3, 2022

This is to fix cross NixOS builds. buildPerlModule uses Module::Build
which does not cross-build. The package doesn't seem to need
Module::Build so switching to buildPerlPackage seems to be safe.

Motivation for this change

#66741 (comment)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@dasJ dasJ requested review from stigtsp and zakame as code owners February 3, 2022 18:56
This is to fix cross NixOS builds. buildPerlModule uses Module::Build
which does not cross-build. The package doesn't seem to need
Module::Build so switching to buildPerlPackage seems to be safe.
@dasJ dasJ force-pushed the fix/nixos-top-level-cross branch from e31d50c to 1ec30a9 Compare February 3, 2022 18:57
@dasJ dasJ changed the title perlPackages.ConfigIniFiles: Use buildPerlModules perlPackages.ConfigIniFiles: Use buildPerlPackage Feb 3, 2022
@dasJ
Copy link
Member Author

dasJ commented Feb 3, 2022

@GrahamcOfBorg test switchTest

Copy link
Contributor

@ius ius left a comment

Choose a reason for hiding this comment

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

The build output is a superset of the original derivation, so I see no reason why this wouldn't work.

+ .../lib/perl5/5.34.0/x86_64-linux-thread-multi/perllocal.pod

Other than that, it's equal.

@ius ius added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Feb 3, 2022
@dasJ dasJ merged commit 0f2f30e into NixOS:master Feb 3, 2022
@dasJ dasJ deleted the fix/nixos-top-level-cross branch February 3, 2022 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants