Please backport all version bumps leading up to this one from master.

Do I then squash those commits to one, or leave them as two/more commits?

We like to keep the papertrail intact, which git cherry-pick -x does nicely. Keep every commit as is.

We like to keep the papertrail intact, which git cherry-pick -x does nicely. Keep every commit as is.

When you say cherry-pick from master - does that always mean from nixos/nixpkgs master? ... or can thhat be from my master?
(Reason I ask - if I'm opening up three identical pull requests, one for each branch I'm been cherry-picking from mine so I don't have to wait for the first to be merged)

We need to wait for commits to be on nixpkgs master before you pick them, since the commit Ids can still change. So in case of a backport you can only do that, once the commits have hit nixpkgs/master.

We need to wait for commits to be on nixpkgs master before you pick them, since the commit Ids can still change. So in case of a backport you can only do that, once the commits have hit nixpkgs/master.

Guess I'll have to redo all those pull requests then - darn it.

About to tag you on one I think I've followed your procedure on. Please poke me if I'm wrong on it.

@andir

Please also pick commit c7224f12c37bc90b452591cd597e1ac8f160d9c9 to this branch (before your latest change) and then this should be fine. You can (and should) also add the cherry-picked reference for the 1.10.8 -> 10.10.9 bump (89cd509).

This is my problem... I can't cherry pick these:

commit d93c4e2f85cefff85d2bc09b696539cfa5189f50
Merge: 9ca1f49410a c7224f12c37
Author: Florian Klink <flokli@flokli.de>
Date:   Mon Aug 17 00:34:42 2020 +0200

    Merge pull request #95600 from dasj19/ant-updates
    
    apache ant: 1.9.6 -> 1.9.15; 1.10.2 -> 1.10.8

More than one update in that commit.

They won't commit because the git log history for that file looks like this:

commit 89cd50903d2eebf8c7ba821b54a1665cc232db0a (origin/update_ant_1.10.9)
Author: Red Davies <red@infect.me>
Date:   Wed Nov 4 21:07:36 2020 +0000

    ant: 1.10.8 -> 1.10.9

commit c7224f12c37bc90b452591cd597e1ac8f160d9c9
Author: Daniel Șerbănescu <daniel@serbanescu.dk>
Date:   Sun Aug 16 17:19:35 2020 +0200

    ant: 1.10.2 -> 1.10.8

commit 84cf00f98031e93f389f1eb93c4a7374a33cc0a9
Author: Michael Reilly <OmnipotentEntity@gmail.com>
Date:   Tue Mar 31 21:11:51 2020 -0400

    treewide: Per RFC45, remove all unquoted URLs

84cf00f has never been applied to 20.03 and since that has changes for 9,648 files I can't really apply that one first.

I don't know how to proceed.

Just the apply the two ant commits and fix the conflict locally.

Thank you for your contribution. Unfortunately it is not in a state to be merged as-is, and NixOS 20.03 is EOL as of today.

Closing.