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.

Sign up for GitHub

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

Jump to bottom

[23.05] nixVersions: 2.15.0 -> 2.15.1, nixVersions: add 2.16.1, nixVersions.minver: init #236430

Merged
merged 5 commits into from
Jun 8, 2023
Merged

[23.05] nixVersions: 2.15.0 -> 2.15.1, nixVersions: add 2.16.1, nixVersions.minver: init #236430

merged 5 commits into from
Jun 8, 2023

Conversation

lorenzleutgeb
Copy link
Member

@lorenzleutgeb lorenzleutgeb commented Jun 7, 2023 •
edited
Loading

Backports:

@RaitoBezarius
Copy link
Member

Why does this comply for backport criteria?

@Kranzes
Copy link
Member

Kranzes commented Jun 7, 2023 •
edited
Loading

Yeah, I believe we decided to stick with 2.13.3 on stable for now.

I think anything except #233439 can be backported, right?

@RaitoBezarius RaitoBezarius marked this pull request as draft June 7, 2023 11:39
@lorenzleutgeb
Copy link
Member Author

lorenzleutgeb commented Jun 7, 2023 •
edited
Loading

Sorry, I missed that this would change nixVersions.stable. I removed #233439.

Why does this comply for backport criteria?

It complies with the criteria "Version updates which include new functionality (but no breaking changes)". I for example would like to use Nix 2.16 (because it features trustless remote builds) with NixOS 23.05 without pulling in unstable.

@RaitoBezarius I'd be happy to get more feedback on this new version. It's my first backporting PR...

@Kranzes
Copy link
Member

Kranzes commented Jun 7, 2023

I think their complaint was about #233439. The rest does seem to fit the backporting policy.

@RaitoBezarius
Copy link
Member

I would also argue that you should not move nixUnstable, 2.16 has a lot of breaking changes, for example, I cannot rebuild my system with 2.16.0, so please keep it this way until we revisit this in some weeks.

infinisil and others added 2 commits June 7, 2023 14:23
@infinisil @lorenzleutgeb
nixVersions.minver: init
ac649fb 
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
(cherry picked from commit 29124b8)
@zowoq @lorenzleutgeb
nixVersions.nix_2_16: 2.16.0 -> 2.16.1
c77160a 
https://github.com/NixOS/nix/releases/tag/2.16.1
(cherry picked from commit 0397205)
@lorenzleutgeb
Copy link
Member Author

OK, I dropped 95b8221

@lorenzleutgeb lorenzleutgeb changed the title [23.05] nixVersions: 2.15.0 -> 2.15.1, init 2.16.1, nixVersions.unstable: 2.15 -> 2.16, nixVersions.minver: init [23.05] nixVersions: 2.15.0 -> 2.15.1, init 2.16.1, nixVersions.minver: init Jun 7, 2023
@lorenzleutgeb lorenzleutgeb changed the title [23.05] nixVersions: 2.15.0 -> 2.15.1, init 2.16.1, nixVersions.minver: init [23.05] nixVersions: 2.15.0 -> 2.15.1, nixVersions: add 2.16.1, nixVersions.minver: init Jun 7, 2023
@lorenzleutgeb lorenzleutgeb marked this pull request as ready for review June 7, 2023 12:37
@RaitoBezarius
Copy link
Member

Let's wait for CI now.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jun 7, 2023
@ofborg ofborg bot requested review from Artturin and edolstra June 7, 2023 13:33
@wegank
Copy link
Member

wegank commented Jun 7, 2023

Result of nixpkgs-review pr 236430 run on aarch64-darwin 1

14 packages built:
  • nix-init
  • nixVersions.minimum
  • nixVersions.minimum.dev
  • nixVersions.minimum.doc
  • nixVersions.minimum.man
  • nixVersions.nix_2_15 (nixVersions.unstable)
  • nixVersions.nix_2_15.dev (nixVersions.unstable.dev)
  • nixVersions.nix_2_15.doc (nixVersions.unstable.doc)
  • nixVersions.nix_2_15.man (nixVersions.unstable.man)
  • nixVersions.nix_2_16
  • nixVersions.nix_2_16.dev
  • nixVersions.nix_2_16.doc
  • nixVersions.nix_2_16.man
  • nurl

@PetarKirov
Copy link

Is this PR ready to be merged?

@wegank wegank merged commit 5c4b536 into NixOS:release-23.05 Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kranzes Kranzes Awaiting requested review from Kranzes

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@infinisil infinisil Awaiting requested review from infinisil

@wegank wegank Awaiting requested review from wegank

@Artturin Artturin Awaiting requested review from Artturin

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@lorenzleutgeb @RaitoBezarius @Kranzes @wegank @PetarKirov @lovesegfault @infinisil @zowoq