nixpkgs/pkgs/development/tools/build-managers
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
..
alibuild alibuild: 1.5.4rc3 -> 1.5.5 2020-03-31 09:29:48 -07:00
apache-ant ant: 1.10.2 -> 1.10.8 2020-08-16 17:19:35 +02:00
apache-maven maven: Wrap mvnDebug for convenience 2020-05-15 16:56:58 +02:00
arpa2cm
bam
bazel format 2020-10-19 18:32:48 +02:00
bear treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
bloop treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
bmake bmake: 20200710 -> 20200902 2020-09-07 15:20:05 +00:00
boot treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
buck
cmake Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
colormake colormake: use fetchFromGitHub 2020-05-29 20:00:56 -04:00
conan conan: 1.25.0 -> 1.27.0 2020-07-01 12:45:39 -07:00
doit treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
drake treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
dub treewide: add quotes to recently-changed urls 2020-03-28 00:05:50 +01:00
fac fac-build: init at 0.5.3 2020-09-15 21:23:24 -04:00
gn gn: 20190403 -> 2020-03-09 2020-03-24 14:41:11 +01:00
gnumake gnumake42: bring this version back 2020-07-06 10:55:32 +02:00
gradle gradle: 6.5 -> 6.6 2020-08-16 13:10:15 +00:00
gup
icmake treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
jam treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
kati treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
leiningen treewide: remove the-kenny from maintainers 2020-05-09 10:28:57 +01:00
mage buildGoModule: remove platform.all from packages 2020-08-15 19:34:47 -07:00
meson Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
mill mill: 0.7.4 -> 0.8.0 2020-08-02 06:42:01 +00:00
mk treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
msbuild treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
ninja ninja: 1.10.0 -> 1.10.1 2020-08-24 11:58:01 +02:00
pants
qbs qbs: 1.15.0 -> 1.16.0 2020-05-10 05:13:15 +00:00
rake treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
rebar treewide: remove the-kenny from maintainers 2020-05-09 10:28:57 +01:00
rebar3 treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
redo treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
redo-apenwarr redo-apenwarr: install bash completion 2020-07-07 04:20:00 -05:00
redo-c redo-c: Initial 0.2 2020-07-10 00:48:57 +02:00
redo-sh redo-sh: 2.0.3 → 4.0.3 2020-09-15 10:16:30 +02:00
remake treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
rocm-cmake rocm-cmake: 3.7.0 -> 3.8.0 2020-09-19 08:08:29 +02:00
samurai samurai: 1.0 -> 1.1 2020-04-01 18:58:42 -07:00
sbt sbt: apply autoPatchelfHook only in Linux 2020-10-11 08:04:16 +01:00
sbt-extras sbt-extras: 2020-06-01 -> 2020-09-24 2020-10-01 09:39:36 -04:00
scons scons: 4.0.0 -> 4.0.1 (#93415) 2020-07-19 11:41:41 +02:00
shards shards: 0.9.0 -> 0.10.0 2020-04-22 17:30:22 +08:00
tup tup: fix setup hook location 2020-06-13 11:03:55 +05:30
waf waf: 2.0.19 -> 2.0.20 2020-04-21 08:40:14 +02:00
wafHook Merge pull request #79593 from thefloweringash/wafhook-phases 2020-03-22 01:59:41 -04:00