Skip to content

nixVersions.nix_2_14: init at 2.14.1#218889

Merged
Mic92 merged 2 commits intoNixOS:masterfrom
qowoz:nix214
Mar 3, 2023
Merged

nixVersions.nix_2_14: init at 2.14.1#218889
Mic92 merged 2 commits intoNixOS:masterfrom
qowoz:nix214

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Feb 28, 2023 •
edited
Loading

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/)
  • 23.05 Release Notes (or backporting 22.11 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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Feb 28, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 28, 2023
@zowoq
Copy link
Contributor Author

zowoq commented Feb 28, 2023

Checked nixpkgs-review with 2.14 as stable, two failures:

@lf-
Copy link
Member

lf- commented Mar 1, 2023 

* `nix-doc` @lf-

Thanks for the ping. I may have some time tomorrow to assess the damage

@Mic92
Copy link
Member

Mic92 commented Mar 1, 2023

Can we merge this without setting it as a default and than I will fix nix-eval-jobs and issue a new release?

@zowoq
Copy link
Contributor Author

zowoq commented Mar 1, 2023

Can we merge this without setting it as a default

Yes, that's why I did unstable -> 2.14. Or do you mean I should drop the unstable commit?

lf- added a commit to lf-/nixpkgs that referenced this pull request Mar 1, 2023
@lf-
nix-doc: 0.5.7 -> 0.5.8
e86853c 
Fixes Nix 2.14 build support. Checked to build against both Nix 2.13 and
Nix 2.14 on x86_64-linux.

Related: NixOS#218889
@lf- lf- mentioned this pull request Mar 1, 2023
Merged
12 tasks
@lf-
Copy link
Member

lf- commented Mar 1, 2023

nix-doc has been fixed

@Artturin
Copy link
Member

Artturin commented Mar 1, 2023

Will need #146515 before a stable bump

zowoq pushed a commit that referenced this pull request Mar 2, 2023
@lf- @zowoq
nix-doc: 0.5.7 -> 0.5.8
21eaf07 
Fixes Nix 2.14 build support. Checked to build against both Nix 2.13 and
Nix 2.14 on x86_64-linux.

Related: #218889
@zowoq
Copy link
Contributor Author

zowoq commented Mar 2, 2023

@Artturin Are you okay with merging this?

@zowoq zowoq changed the title nixVersions.nix_2_14: init at 2.14.0 nixVersions.nix_2_14: init at 2.14.1 Mar 2, 2023
@Mic92
Copy link
Member

Mic92 commented Mar 3, 2023

@Artturin Are you okay with merging this?

This is my interpretation since this is not making it the default.

@Mic92 Mic92 merged commit f055ce8 into NixOS:master Mar 3, 2023
@zowoq zowoq deleted the nix214 branch March 3, 2023 11:30
@infinisil infinisil mentioned this pull request May 22, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@edolstra edolstra Awaiting requested review from edolstra

@Artturin Artturin Awaiting requested review from Artturin

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@zowoq @lf- @Mic92 @Artturin