Skip to content

Backport #386757 to release-24.11#391063

Merged
drupol merged 14 commits intoNixOS:release-24.11from
drupol:backport-386757-to-release-24.11
Mar 18, 2025
Merged

Backport #386757 to release-24.11#391063
drupol merged 14 commits intoNixOS:release-24.11from
drupol:backport-386757-to-release-24.11

Conversation

@drupol
Copy link
Contributor

@drupol drupol commented Mar 18, 2025

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.

drupol added 14 commits March 18, 2025 20:50
(cherry picked from commit 25e851d)
The release management of deployer is something I've never seen.
They basically commit the PHAR file in the source, in a specific branch.
They also modify the runner `bin/dep` to use that PHAR. Therefore, this
break on NixOS since we are using the PHAR.
A workaround is to use the master branch that doesn't contain the PHAR.

(cherry picked from commit 2e4faeb)
(cherry picked from commit e7304f5)
(cherry picked from commit 66d96a7)
(cherry picked from commit 6e8e6c4)
(cherry picked from commit 1de8208)
…t to `true` by default

(cherry picked from commit 64b2466)
(cherry picked from commit c0999f4)
@github-actions github-actions bot added the 6.topic: php PHP is a general-purpose scripting language geared towards web development. label Mar 18, 2025
@nix-owners nix-owners bot requested review from Ma27, aanderse, globin and talyz March 18, 2025 20:03
@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 18, 2025
@nix-owners nix-owners bot requested a review from piotrkwiecinski March 18, 2025 20:08
@drupol drupol merged commit 12610ad into NixOS:release-24.11 Mar 18, 2025
23 checks passed
@drupol drupol deleted the backport-386757-to-release-24.11 branch March 18, 2025 20:09
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.

1 participant