Skip to content

libwebsockets: Fix CMake config for static build#507822

Merged
Mindavi merged 1 commit into
NixOS:masterfrom
hmenke:libwebsockets-static
Apr 9, 2026
Merged

libwebsockets: Fix CMake config for static build#507822
Mindavi merged 1 commit into
NixOS:masterfrom
hmenke:libwebsockets-static

Conversation

@hmenke

@hmenke hmenke commented Apr 8, 2026

Copy link
Copy Markdown
Member

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@hmenke hmenke force-pushed the libwebsockets-static branch from cd6a2dd to 0fe5756 Compare April 8, 2026 08:39
@nixpkgs-ci nixpkgs-ci Bot requested a review from Mindavi April 8, 2026 08:46
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Apr 8, 2026
@Mindavi

Mindavi commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

I'm fine with this but I prefer this being upstreamed in a more structured way.

@hmenke

hmenke commented Apr 8, 2026

Copy link
Copy Markdown
Member Author

@Mindavi Done. warmcat/libwebsockets#3567

@Mindavi

Mindavi commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

Might be good to then add a comment referencing that. Then I think this is good enough for now and we can remove it again when it's upstream.

@hmenke hmenke force-pushed the libwebsockets-static branch from 0fe5756 to 45b7bef Compare April 9, 2026 06:54
Mindavi
Mindavi approved these changes Apr 9, 2026
View reviewed changes

@Mindavi Mindavi left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good. Not sure what's up with the lint fail. It seems something flaky. @NixOS/nix-formatting I restarted but maybe good to have a look? Or did I miss the actual failure? It seemed to have timed out after 10min in the previous run.

@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Apr 9, 2026
@hmenke

hmenke commented Apr 9, 2026

Copy link
Copy Markdown
Member Author

I ran locally

$ treefmt pkgs/by-name/li/libwebsockets/package.nix
traversed 1 files
emitted 1 files for processing
formatted 0 files (0 changed) in 35ms

To me it looks like the linter didn't really fail, but timed out after 10 minutes.

@Mindavi Mindavi added this pull request to the merge queue Apr 9, 2026
Merged via the queue into NixOS:master with commit 96dc3ba Apr 9, 2026
50 of 54 checks passed
@hmenke hmenke deleted the libwebsockets-static branch April 9, 2026 16:13
@jfly

jfly commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

To me it looks like the linter didn't really fail, but timed out after 10 minutes.

Wild guess that this is this (now fixed) treefmt issue: numtide/treefmt#677. Update has landed in nixpkgs: #507711, but I don't think will be usable until we update ci/pinned.json.

@NixOS/nixpkgs-ci, @brianmcgee FYI. If we see more of these timeouts, it might make sense to update our pinned version of nixpkgs to pull in the latest treefmt.

@mdaniels5757

mdaniels5757 commented Apr 9, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Ah, so that's what that was! I think I have seen this before, so I'll make a ci/pinned.json update.

@mdaniels5757 mdaniels5757 mentioned this pull request Apr 9, 2026
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mindavi Mindavi Mindavi approved these changes

Assignees

No one assigned

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hmenke @Mindavi @jfly @mdaniels5757