Skip to content

varnish: fix builds of varnish, varnish77, and varnish60 on macOS#416291

Merged
Aleksanaa merged 1 commit intoNixOS:masterfrom
sandydoo:fix-varnish
Jun 17, 2025
Merged

varnish: fix builds of varnish, varnish77, and varnish60 on macOS#416291
Aleksanaa merged 1 commit intoNixOS:masterfrom
sandydoo:fix-varnish

Conversation

@sandydoo
Copy link
Contributor

@sandydoo sandydoo commented Jun 12, 2025

Applies several patches to get varnish to build on macOS.

For varnish77:

For varnish60:

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jun 12, 2025
@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-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 12, 2025
@nix-owners nix-owners bot requested review from Ma27, ctheune, dpausp, frlan, leona-ya and osnyx June 12, 2025 23:49
@sandydoo
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 416291
Commit: e9bb1002df57c391ee531cab308c1dc1758d0ea8


x86_64-darwin

✅ 7 packages built:
  • prometheus-varnish-exporter
  • varnish (varnish77)
  • varnish.dev (varnish77.dev)
  • varnish.man (varnish77.man)
  • varnish60
  • varnish60.dev
  • varnish60.man

aarch64-darwin

✅ 7 packages built:
  • prometheus-varnish-exporter
  • varnish (varnish77)
  • varnish.dev (varnish77.dev)
  • varnish.man (varnish77.man)
  • varnish60
  • varnish60.dev
  • varnish60.man

Applies several patches to get varnish to build on macOS.

For `varnish77`:

  - Fix `endian.h` compatibility for macOS
    varnishcache/varnish-cache#4339

  - Fix VMOD section attribute on macOS
    https://github.com/varnishcache/varnish-cache/commit/a95399f5b9eda1bfdba6ee6406c30a1ed0720167.patch

For `varnish60`:

  - Fix duplicate OS_CODE definitions on macOS
    varnishcache/varnish-cache#4347
@sandydoo
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 416291
Commit: 83447b6d6857d163be6caab7691b64d3590f990c


x86_64-darwin

✅ 7 packages built:
  • prometheus-varnish-exporter
  • varnish (varnish77)
  • varnish.dev (varnish77.dev)
  • varnish.man (varnish77.man)
  • varnish60
  • varnish60.dev
  • varnish60.man

aarch64-darwin

✅ 7 packages built:
  • prometheus-varnish-exporter
  • varnish (varnish77)
  • varnish.dev (varnish77.dev)
  • varnish.man (varnish77.man)
  • varnish60
  • varnish60.dev
  • varnish60.man

@Aleksanaa Aleksanaa merged commit 6d5d1ad into NixOS:master Jun 17, 2025
15 of 16 checks passed
@sandydoo sandydoo deleted the fix-varnish branch June 17, 2025 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages 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