Skip to content

[25.11] imagemagick: fix cross compile#489024

Merged
Ma27 merged 3 commits intoNixOS:staging-25.11from
aszenz:backport-474586-to-release-25.11
Feb 13, 2026
Merged

[25.11] imagemagick: fix cross compile#489024
Ma27 merged 3 commits intoNixOS:staging-25.11from
aszenz:backport-474586-to-release-25.11

Conversation

@aszenz
Copy link
Contributor

@aszenz aszenz commented Feb 10, 2026

Backport of #474586 to release-25.11.

Cherry-picked commits:

  • 7a27271 phpPackages.imagick: fix cross compilation
  • e7a4c6c imagemagick: fix cross compile
  • 624d040 phpPackages.imagick: cleanup

onny added 3 commits February 10, 2026 10:51
(cherry picked from commit e7a4c6c)
(cherry picked from commit 624d040)
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 127574d and original 624d040 may warrant inspection.

Show diff
@@ Metadata
  ## Commit message ##
     phpPackages.imagick: cleanup
 
+    (cherry picked from commit 624d04074e6ebcfa7889c33b1552a7f8d20ead7f)
+
  ## pkgs/development/php-packages/imagick/default.nix ##
 @@ pkgs/development/php-packages/imagick/default.nix: buildPecl {
    pname = "imagick";
  
-   version = "3.8.1";
--  sha256 = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4=";
-+  hash = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4=";
+   version = "3.8.0";
+-  sha256 = "sha256-vaZ0YchU8g1hBXgrdpxST8NziLddRIHZUWRNIWf/7sY=";
++  hash = "sha256-vaZ0YchU8g1hBXgrdpxST8NziLddRIHZUWRNIWf/7sY=";
  
    configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
  

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

github-actions[bot]

This comment was marked as outdated.

@nixpkgs-ci nixpkgs-ci bot requested review from a team, Ma27, aanderse, dotlambda, faukah, globin, rhendric and talyz February 10, 2026 09:59
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 6.topic: php PHP is a general-purpose scripting language geared towards web development. 4.workflow: backport This targets a stable branch labels Feb 10, 2026
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Eh wait, this needs to go through staging-25.11.

@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. labels Feb 13, 2026
@aszenz aszenz changed the base branch from release-25.11 to staging-25.11 February 13, 2026 14:10
@aszenz aszenz requested a review from Ma27 February 13, 2026 14:10
@nixpkgs-ci nixpkgs-ci bot closed this Feb 13, 2026
@nixpkgs-ci nixpkgs-ci bot reopened this Feb 13, 2026
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Feb 13, 2026
@Ma27 Ma27 added this pull request to the merge queue Feb 13, 2026
Merged via the queue into NixOS:staging-25.11 with commit 2b5f2f3 Feb 13, 2026
62 of 66 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: php PHP is a general-purpose scripting language geared towards web development. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 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

Development

Successfully merging this pull request may close these issues.

3 participants