Skip to content

build-support/php: refactor build scripts#386757

Merged
drupol merged 14 commits intoNixOS:masterfrom
drupol:push-wwwyxnkuytvr
Mar 5, 2025
Merged

build-support/php: refactor build scripts#386757
drupol merged 14 commits intoNixOS:masterfrom
drupol:push-wwwyxnkuytvr

Conversation

@drupol
Copy link
Contributor

@drupol drupol commented Mar 3, 2025

Continuation of #385830

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added the 6.topic: php PHP is a general-purpose scripting language geared towards web development. label Mar 3, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 3, 2025
@drupol drupol force-pushed the push-wwwyxnkuytvr branch from 8da10ba to 0618c1f Compare March 3, 2025 15:46
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 3, 2025
@drupol
Copy link
Contributor Author

drupol commented Mar 3, 2025

@ShamrockLee I've been working on this and refactoring a bit more, but I'm still unable to override vendorHash using <derivation>.overrideAttrs { vendorHash = "foo"; };

Do you mind having a look and let me know any improvements/simplification?

@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Mar 3, 2025
@drupol drupol force-pushed the push-wwwyxnkuytvr branch 4 times, most recently from 29e2be3 to 6b84d63 Compare March 3, 2025 19:16
@drupol drupol force-pushed the push-wwwyxnkuytvr branch 2 times, most recently from faee832 to fb94364 Compare March 3, 2025 20:58
@drupol drupol marked this pull request as ready for review March 3, 2025 21:06
@drupol drupol force-pushed the push-wwwyxnkuytvr branch 2 times, most recently from 3284204 to 21be32c Compare March 3, 2025 21:27
@piotrkwiecinski

This comment was marked as outdated.

@piotrkwiecinski

This comment was marked as resolved.

@drupol

This comment was marked as resolved.

@piotrkwiecinski

This comment was marked as resolved.

@drupol

This comment was marked as resolved.

@drupol drupol force-pushed the push-wwwyxnkuytvr branch from f04a7e8 to bf7ed8f Compare March 4, 2025 10:25
@drupol
Copy link
Contributor Author

drupol commented Mar 4, 2025

I'm 90% sure that the hash change comes from an old PR. I'm quite confident that the current builder is quite stable, I would not worry about this at the moment.

@drupol
Copy link
Contributor Author

drupol commented Mar 4, 2025

I could have used dontCheckForBrokenSymlinks from #370750 too. What is the best solution ?

@piotrkwiecinski
Copy link
Contributor

I reckon it's fine to just remove invalid symlinks. Probably they should be resolved upstream. I don't think we should remove the check completely.

@piotrkwiecinski

This comment was marked as outdated.

@drupol drupol force-pushed the push-wwwyxnkuytvr branch 2 times, most recently from c3da137 to 968c83f Compare March 4, 2025 22:12
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't it be better to enable it by default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, broken symlinks are something that might be something we can have since we use composer with --no-dev by default. This is why I disable it by default.

@drupol drupol force-pushed the push-wwwyxnkuytvr branch from 968c83f to be4c843 Compare March 4, 2025 22:21
@drupol drupol force-pushed the push-wwwyxnkuytvr branch from be4c843 to c0999f4 Compare March 4, 2025 22:23
@piotrkwiecinski
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 386757


x86_64-linux

⏩ 2 packages marked as broken and skipped:
  • php81Packages.phpinsights
  • php81Packages.psalm
✅ 76 packages built:
  • agorakit
  • composer-require-checker
  • davis
  • flarum
  • grocy
  • invoiceplane
  • kimai
  • laravel
  • librenms
  • movim
  • n98-magerun
  • n98-magerun2
  • paratest
  • pdepend
  • pest
  • phel
  • php81Packages.box (php82Packages.box, php83Packages.box, php84Packages.box)
  • php81Packages.castor
  • php81Packages.deployer
  • php81Packages.grumphp
  • php81Packages.phing
  • php81Packages.phive
  • php81Packages.php-codesniffer
  • php81Packages.php-cs-fixer
  • php81Packages.php-parallel-lint
  • php81Packages.phpmd
  • php81Packages.phpstan
  • php81Packages.psysh
  • php82Packages.castor
  • php82Packages.deployer
  • php82Packages.grumphp
  • php82Packages.phing
  • php82Packages.phive
  • php82Packages.php-codesniffer
  • php82Packages.php-cs-fixer
  • php82Packages.php-parallel-lint
  • php82Packages.phpinsights
  • php82Packages.phpmd
  • php82Packages.phpstan
  • php82Packages.psalm
  • php82Packages.psysh
  • php83Packages.castor
  • php83Packages.deployer
  • php83Packages.grumphp
  • php83Packages.phing
  • php83Packages.phive
  • php83Packages.php-codesniffer
  • php83Packages.php-cs-fixer
  • php83Packages.php-parallel-lint
  • php83Packages.phpinsights
  • php83Packages.phpmd
  • php83Packages.phpstan
  • php83Packages.psalm
  • php83Packages.psysh
  • php84Packages.castor
  • php84Packages.deployer
  • php84Packages.grumphp
  • php84Packages.phing
  • php84Packages.phive
  • php84Packages.php-codesniffer
  • php84Packages.php-cs-fixer
  • php84Packages.php-parallel-lint
  • php84Packages.phpinsights
  • php84Packages.phpmd
  • php84Packages.phpstan
  • php84Packages.psalm
  • php84Packages.psysh
  • phpactor
  • phpdocumentor
  • phpunit
  • pixelfed
  • roave-backward-compatibility-check
  • robo
  • simplesamlphp
  • snipe-it
  • vimPlugins.phpactor

@drupol
Copy link
Contributor Author

drupol commented Mar 5, 2025

Good for you @piotrkwiecinski ?

@drupol drupol merged commit 349333d into NixOS:master Mar 5, 2025
23 checks passed
@drupol drupol deleted the push-wwwyxnkuytvr branch March 5, 2025 08:18
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Mar 18, 2025

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

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

git fetch origin release-24.11
git worktree add -d .worktree/backport-386757-to-release-24.11 origin/release-24.11
cd .worktree/backport-386757-to-release-24.11
git switch --create backport-386757-to-release-24.11
git cherry-pick -x 5387f9cc48c937a238ef9e6e7cebf9ccac14672d 25e851d0887cb5ca31b77ab038ac6490de1b4875 2e4faebd4d9e4dee920a2c884e0d37cd44a5625e 47f6b52a456670c292d42971f42f430137b6307a 874a6d7d366380bee5c87bf98b90ff6fad7a718c 7e70611b1ed00f61e2ea8da5a6f871ec2a06f6ea e7304f587a2d632839cb7481a9965f7309bc08d9 66d96a76b590edf9fd4f749ad9ad644f762a748e 6e8e6c413d7a189f85d3319b9e0ade14296eda53 1de8208e4a542d10b5fdfd52c35f6f2221f2df24 489ac4817f5ed4101d9865a551622ce80ec87a7f 64b246657df86cde5a8ff8f713fbd3721cb6b598 c0999f435e35bbee0968af460bc4db84bf9f6b11 1afb093ed66dcdd354ed1518ccbf46d4ea79503d

@drupol
Copy link
Contributor Author

drupol commented Mar 18, 2025

Backport @ #391063

drupol added a commit that referenced this pull request Mar 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: php PHP is a general-purpose scripting language geared towards web development. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants