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

libpsl: enable Windows builds #350819

Merged
merged 1 commit into from
Oct 27, 2024
Merged

Conversation

greg-hellings
Copy link
Contributor

@greg-hellings greg-hellings commented Oct 24, 2024

Bringing python3 into the mix breaks Windows builds, which in turn
prevents curl from building on Windows in the default configuration for
nixpkgs. Excluding python3 from the buildInputs on Windows prevents that
problem

The rest of the changes are nixfmt changes

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.

Bringing python3 into the mix breaks Windows builds, which in turn
prevents curl from building on Windows in the default configuration for
nixpkgs. Excluding python3 from the buildInputs on Windows prevents that
problem

The rest of the changes are nixfmt changes
@greg-hellings
Copy link
Contributor Author

Related to #351010 but that fix still doesn't enable the default pyhthon 3.12 package to build, so this package would need to pull python311 specifically for Windows targets.

@greg-hellings greg-hellings marked this pull request as ready for review October 24, 2024 20:01
Copy link
Member

@Aleksanaa Aleksanaa left a comment

Choose a reason for hiding this comment

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

Since it's still an exotic platform, I'd assume it works, lgtm as long as it doesn't break others

@Aleksanaa Aleksanaa merged commit a63ca5d into NixOS:master Oct 27, 2024
50 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants