Skip to content

libpsl-with-scripts: init as override of libpsl#350833

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
rhelmot:libpsl-no-scripts
Feb 13, 2025
Merged

libpsl-with-scripts: init as override of libpsl#350833
Ericson2314 merged 1 commit intoNixOS:stagingfrom
rhelmot:libpsl-no-scripts

Conversation

@rhelmot
Copy link
Copy Markdown
Contributor

@rhelmot rhelmot commented Oct 24, 2024

psl-make-dafsa pulls in a runtime python3 dependency which seems to have given various build configurations no end of trouble. This solves the problem in the least subtle manner imaginable, by removing it for all platforms and re-adding it in a new package which currently has no dependencies. Switch your dependency from libpsl to libpsl-with-scripts if you are impacted by this.

ref #347007 #344211 #344209 #344157 #335458

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-openbsd (cross from linux)
  • 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.

@ofborg ofborg Bot added the 8.has: package (new) This PR adds a new package label Oct 24, 2024
@ofborg ofborg Bot added 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. labels Oct 24, 2024
@bjornfor bjornfor removed their request for review October 24, 2024 06:17
Copy link
Copy Markdown
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

LGTM, but I have no idea what libpsl is, so I'll defer to others.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
@rhelmot rhelmot force-pushed the libpsl-no-scripts branch 2 times, most recently from 6147aa3 to 35d05a7 Compare November 2, 2024 04:47
@rhelmot
Copy link
Copy Markdown
Contributor Author

rhelmot commented Nov 2, 2024

Since I made this PR, another point in favor of this solution: #350819

@ofborg ofborg Bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 2, 2024
@ofborg ofborg Bot requested a review from bjornfor November 2, 2024 17:15
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 10, 2024
@Ericson2314
Copy link
Copy Markdown
Member

Could have libpsl-scripts depend on libpsl? That would be my ideal solution, we so don't get two copies of the library in closures, potentially causing problems.

@rhelmot rhelmot force-pushed the libpsl-no-scripts branch 2 times, most recently from b38672f to b99433f Compare November 18, 2024 00:22
@rhelmot
Copy link
Copy Markdown
Contributor Author

rhelmot commented Nov 18, 2024

Done!

@rhelmot rhelmot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 30, 2024
@ofborg ofborg Bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 12, 2025
psl-make-dafsa pulls in a runtime python3 dependency which seems to have
given various build configurations no end of trouble. This solves the
problem in the least subtle manner imaginable, by removing it for all
platforms and re-adding it in a new package which currently has no
dependants. Switch your dependency from libpsl to libpsl-with-scripts
if you are impacted by this.
@ofborg ofborg Bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 12, 2025
Copy link
Copy Markdown
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Fantastic! Splitting packages to deal with optional deps, without causing stuff to be recompiled, is the best!

@Ericson2314 Ericson2314 merged commit 5b04642 into NixOS:staging Feb 13, 2025
@Ericson2314 Ericson2314 deleted the libpsl-no-scripts branch February 13, 2025 01:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 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

Development

Successfully merging this pull request may close these issues.

4 participants