Skip to content

socklog: set __darwinAllowLocalNetworking#418239

Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom
mdaniels5757:update-socklog
Jun 28, 2025
Merged

socklog: set __darwinAllowLocalNetworking#418239
wolfgangwalther merged 1 commit intoNixOS:masterfrom
mdaniels5757:update-socklog

Conversation

@mdaniels5757
Copy link
Member

@mdaniels5757 mdaniels5757 commented Jun 19, 2025

Fixes Darwin tests.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 19, 2025
@mdaniels5757

This comment was marked as outdated.

@mdaniels5757 mdaniels5757 marked this pull request as ready for review June 19, 2025 19:30
@nix-owners nix-owners bot requested a review from joachifm June 19, 2025 19:31
@wolfgangwalther
Copy link
Contributor

Closes: #414979

I merged that PR with most of the changes from here already, please rebase so we get the remainder.

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 27, 2025
@mdaniels5757 mdaniels5757 changed the title socklog: 2.1.0 -> 2.1.1 socklog: set __darwinAllowLocalNetworking Jun 28, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 28, 2025
@nixpkgs-ci nixpkgs-ci bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 28, 2025
@mdaniels5757
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 418239

Logs: https://github.com/mdaniels5757/nixpkgs-review-gha/actions/runs/15940525779


x86_64-darwin (sandbox = true)

✅ 3 packages built:
  • socklog
  • socklog.doc
  • socklog.man

aarch64-darwin (sandbox = true)

✅ 3 packages built:
  • socklog
  • socklog.doc
  • socklog.man

@wolfgangwalther
Copy link
Contributor

Thanks!

@wolfgangwalther wolfgangwalther merged commit 3296115 into NixOS:master Jun 28, 2025
26 of 29 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jun 28, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-418239-to-release-25.05 origin/release-25.05
cd .worktree/backport-418239-to-release-25.05
git switch --create backport-418239-to-release-25.05
git cherry-pick -x 38b0ac9a142e04cba7148b4e631696797599fb6a

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jun 28, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 28, 2025
@mdaniels5757 mdaniels5757 deleted the update-socklog branch June 28, 2025 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: build failure A package fails to build 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants