mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 10:16:44 +01:00
89023c38fc
I made a mistake merge. Reverting it inc778945806undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range:4effe769e2- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state
13 lines
349 B
Nix
13 lines
349 B
Nix
{ makeSetupHook, tests }:
|
|
|
|
# See the header comment in ../setup-hooks/install-shell-files.sh for example usage.
|
|
let
|
|
setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh;
|
|
in
|
|
|
|
setupHook.overrideAttrs (oldAttrs: {
|
|
passthru = (oldAttrs.passthru or {}) // {
|
|
tests = tests.install-shell-files;
|
|
};
|
|
})
|