Skip to content

Commit

Permalink
Use the commit that actually landed in upstream spack
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener committed Nov 20, 2024
1 parent f6b94a4 commit 698e471
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .cherry-pick
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46465.diff

# py-onnx: add a patch for the standard, remove after 1.15.0
git add .
git cherry-pick 248a7c0f4894222bfcd0bb76b13a984c92d4c938 -X theirs --no-commit
git cherry-pick bbd205543b09139f2f57f21099eb366c9f183d76 -X theirs --no-commit

# py-cython: add version 3.0.11, remove when https://github.com/spack/spack/pull/46772 is merged
git cherry-pick 072d308c0b4b53c0d0528ee3a7e59de110133968 -X theirs --no-commit
Expand Down

0 comments on commit 698e471

Please sign in to comment.