nixpkgs/pkgs/stdenv
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid 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 from 4effe769e2)
 - 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
2020-10-26 09:01:04 +01:00
..
cross Merge pull request #86223 from pikajude/darwin-static-eval 2020-09-30 23:44:18 +02:00
custom stdenv: allow custom stdenv to take crossOverlays 2019-01-07 20:53:10 -06:00
cygwin treewide: Make still dont* Variables are optional in most cases 2019-11-01 14:44:44 -04:00
darwin Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
freebsd stdenv: implement crossOverlays 2018-12-04 21:06:46 -06:00
generic hooks: add moveSystemdUserUnitsHook 2020-09-12 18:29:46 +02:00
linux treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
native treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
nix stdenv: implement crossOverlays 2018-12-04 21:06:46 -06:00
adapters.nix pkgsStatic: fix eval on Darwin 2020-04-28 08:41:48 -07:00
booter.nix pkgs/stdenv/booter.nix: Add comment explaining hasCC trickery 2019-12-30 18:09:45 -05:00
common-path.nix bzip2: split into multiple outputs, refactor 2015-04-18 19:32:52 +02:00
default.nix treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00