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

nixVersions.nix_2_11: init at 2.11.0 #188777

Merged
merged 2 commits into from
Aug 29, 2022
Merged

nixVersions.nix_2_11: init at 2.11.0 #188777

merged 2 commits into from
Aug 29, 2022

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Aug 29, 2022

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

nix-fallback-paths done in #188772

Copy link
Member

@lovesegfault lovesegfault left a comment

Choose a reason for hiding this comment

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

You need to update the fallback paths too.

LGTM otherwise.

@zowoq
Copy link
Contributor Author

zowoq commented Aug 29, 2022

You need to update the fallback paths too.

If you read the top post you'll see that this in another PR.

@lovesegfault
Copy link
Member

You need to update the fallback paths too.

If you read the top post you'll see that this in another PR.

I'm on my phone, so it was hidden.

Just cherry-pick into this branch so they land together.

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Aug 29, 2022
@SuperSandro2000
Copy link
Member

You need to update the fallback paths too.

Elco always said in the past that it does not matter to much if they are merged together or not.

@bjornfor
Copy link
Contributor

nixVersions.stable: 2.10 -> 2.11

Observation: If that commit was a separate PR it'd make backporting to stable easier (just label the PR).

@SuperSandro2000
Copy link
Member

Observation: If that commit was a separate PR it'd make backporting to stable easier (just label the PR).

Then we would need to merge 3 PRs at the same time. Not very practical.

@SuperSandro2000 SuperSandro2000 merged commit 031311f into NixOS:master Aug 29, 2022
@zowoq zowoq deleted the nix211 branch August 30, 2022 05:33
@bjornfor
Copy link
Contributor

Then we would need to merge 3 PRs at the same time. Not very practical.

AFAICT it's 2 PRs, and they dont have to be merged at the same time, but we must ensure they are merged in correct order.

@zowoq
Copy link
Contributor Author

zowoq commented Aug 30, 2022

Observation: If that commit was a separate PR it'd make backporting to stable easier (just label the PR).

  • two PRs to master (must be merged in order), automated backport
  • one PR to master, manual backport

So either way people still need to do two PRs except opening two on master is more complicated?

@SuperSandro2000
Copy link
Member

but we must ensure they are merged in correct order.

I don't think that is worth it for the little convince improvement.

@zowoq zowoq mentioned this pull request Aug 16, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants