nixpkgs/pkgs
Vladimír Čunát 1111911593
Merge branch 'staging-next' into staging
I re-verified that the git-tree state looks good after
the trouble addressed in commit 89023c38fc
(by the same approach - comparison to a "clean rebase").
I was actually a little surprised that simple git merge
did the right thing this time.

The one thing I can't fix is that some of staging commits are now
reachable from master even though they're not really applied in there
yet, but that's just temporary effect until the next merge to master.
I certainly don't envy any archeology hitting these commit ranges
(e.g. bisections).
2020-10-26 09:19:25 +01:00
..
applications Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
build-support Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
common-updater
data Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
desktops Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
development Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
games Merge pull request #101614 from rnhmjoj/arx 2020-10-25 09:43:28 +01:00
misc Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 2020-10-26 08:19:17 +01:00
os-specific Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
pkgs-lib pkgs-lib/tests/formats: improve message on failure 2020-10-19 21:46:08 +02:00
servers Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
shells Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
stdenv Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
test Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
tools Merge branch 'staging-next' into staging 2020-10-26 09:19:25 +01:00
top-level Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00