Skip to content

Attempt to fix staging revert#436191

Closed
bendlas wants to merge 1 commit intoNixOS:masterfrom
bendlas:fix-rebase
Closed

Attempt to fix staging revert#436191
bendlas wants to merge 1 commit intoNixOS:masterfrom
bendlas:fix-rebase

Conversation

@bendlas
Copy link
Contributor

@bendlas bendlas commented Aug 23, 2025

Partially reapply "Merge remote-tracking branch 'origin/master' into staging-next"

This reverts commit 106b141. This partially re-applys commit 28cafe5


It seems that a chunk of work got lost, during an attempted staging fix.

This PR is probably not the correct way to fix it, because it just reverts and loses commit information. It may serve as a starting point and for validation. Putting it in draft for now.

Process:

  • Reverted commit 106b141
  • Discarded everything with merge conflicts

This was discovered during #435690

…staging-next"

This reverts commit 106b141.
This partially re-applys commit 28cafe5
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Aug 23, 2025
@bendlas
Copy link
Contributor Author

bendlas commented Aug 23, 2025

Closing in favor of #436200

@bendlas bendlas closed this Aug 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant