Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: update 21.03 to 21.05 #108899

Merged
merged 1 commit into from Feb 12, 2021
Merged

treewide: update 21.03 to 21.05 #108899

merged 1 commit into from Feb 12, 2021

Conversation

lukegb
Copy link
Contributor

@lukegb lukegb commented Jan 10, 2021

The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.

cc @jonringer @FRidh

@lukegb
Copy link
Contributor Author

lukegb commented Jan 10, 2021

Note: this will break inflight PRs which add things to the release notes for 21.05, since this renames the release notes file to match the new version.

@jonringer
Copy link
Contributor

partial overlap with #107565

@lukegb
Copy link
Contributor Author

lukegb commented Jan 10, 2021

partial overlap with #107565

Hrm, should I just drop this PR entirely in favour of that one?

@lukegb
Copy link
Contributor Author

lukegb commented Jan 10, 2021

In any case, I realised I forgot the EOL date update on the 21.05 release notes, so updated that now too.

@lukegb
Copy link
Contributor Author

lukegb commented Jan 10, 2021

@ofborg eval

@cole-h
Copy link
Member

cole-h commented Jan 10, 2021

Not that this can be done in a PR, but we should rename the 21.03 milestone to 21.05 as well.

@vcunat
Copy link
Member

vcunat commented Jan 11, 2021

OK, I did that immediately in this repo, so that we don't forget.

@cole-h
Copy link
Member

cole-h commented Jan 11, 2021

I also went ahead and did the same for the org project (https://github.com/orgs/NixOS/projects/6).

@lukegb lukegb force-pushed the rfc80-to-2105 branch 2 times, most recently from 877e429 to 6340c4b Compare January 12, 2021 20:35
@lukegb
Copy link
Contributor Author

lukegb commented Jan 12, 2021

Rebased again to remove merge conflict.

Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lukegb
Copy link
Contributor Author

lukegb commented Jan 12, 2021

2 more occurrences of 21.03 I found:

Those are intentionally as is: they're comparing stateVersion, so to avoid breaking existing configs (generated with stateVersion = "21.03") they should remain as is, I think.

@FRidh
Copy link
Member

FRidh commented Jan 12, 2021

We need to add 21.05 there additionally, considering 21.03 as a past release, but I don't much about stateVersion though.

@lukegb
Copy link
Contributor Author

lukegb commented Jan 13, 2021

We need to add 21.05 there additionally, considering 21.03 as a past release, but I don't much about stateVersion though.

These two are both relative comparisons rather than exact comparisons.

For the Nextcloud one: there's no nextcloud21 release yet, so nextcloud20 should be the shipped release with stateVersion==21.03 and stateVersion==21.05.
For the Hedgehog one it was a one-off rename, so 21.03+ should call it hedgehog.

@jonringer
Copy link
Contributor

https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/263 has been merged, I think we are good to merge this now

@jonringer
Copy link
Contributor

We need to add 21.05 there additionally, considering 21.03 as a past release, but I don't much about stateVersion though.

Agreed

@lukegb
Copy link
Contributor Author

lukegb commented Jan 24, 2021

We need to add 21.05 there additionally, considering 21.03 as a past release, but I don't much about stateVersion though.

Agreed

I'm still unconvinced in those two specific cases:

  • People who installed with nixos-unstable will have generated configuration.nix with 21.03 (which will never exist)
  • The contract of configuration.nix is such that we shouldn't change things which will have material impact on system state
  • nixos/modules/services/web-apps/nextcloud.nix:
    • If we replace 21.03 with 21.05, we'll downgrade people from nextcloud20 to nextcloud19, which is a breaking change.
    • If we do nothing, it'll "work" fine for people with either 21.03 or 21.05 in their stateVersion.
    • Doing versionOlder stateVersion "21.03" && versionOlder stateVersion "21.05" would be redundant and more than a little confusing. Anything older than 21.03 is obviously also going to be older than 21.05.
    • -> I've compromised and added a comment instead.
  • nixos/modules/services/web-apps/hedgedoc.nix:
    • If we replace 21.03 with 21.05, we'll rename the user from "hedgedoc" back to "codimd", which is a breaking change.
    • If we do nothing, it'll work fine for people with either 21.03 or 21.05 in their stateVersion.
    • Doing versionAtLeast config.system.stateVersion "21.03" || versionAtLeast config.system.stateVersion "21.05" is redundant again and again super confusing. 21.05 is obviously >= 21.03.
    • -> I've compromised and added a comment instead.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM as well.

@lukegb lukegb force-pushed the rfc80-to-2105 branch 2 times, most recently from f9bd2f6 to 94a54af Compare February 2, 2021 17:51
@jonringer
Copy link
Contributor

if you rebase the conflicts, I will merge. Sorry for neglecting this

The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM

@jonringer jonringer merged commit cfed3b8 into NixOS:master Feb 12, 2021
@jonringer
Copy link
Contributor

thank you @lukegb, sorry this got postponed longer than it needed to :)

@lukegb lukegb deleted the rfc80-to-2105 branch December 5, 2022 01:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants