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

Nixpkgs upgrade to NixOS 24.11 (backport #11566) #12270

Open
wants to merge 8 commits into
base: 2.24-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 15, 2025

Motivation

In preparation to NixOS 24.11 this updates nixpkgs to unstable until we can switch to the branch off branch. As a side effect this should also help with #11546
So far only the x86_64-linux build has been tested.

Context

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #11566 done by [Mergify](https://mergify.com).

Mic92 added 8 commits January 15, 2025 20:28
(cherry picked from commit cd002ae)
(cherry picked from commit 9131905)
(cherry picked from commit 81b6b79)
Cross-compilation of curl is broken in nixpkgs. Therefore we disable it
until nixpkgs fixes the underlying issues.

(cherry picked from commit cf0ba0d)
This is needed for macos support as the sandboxed version of lowdown
doesn't work in the nix sandbox.

(cherry picked from commit 2512619)

# Conflicts:
#	doc/manual/package.nix
(cherry picked from commit 20ee83f)

# Conflicts:
#	tests/nixos/default.nix
@mergify mergify bot added the conflicts label Jan 15, 2025
@mergify mergify bot requested a review from fricklerhandwerk as a code owner January 15, 2025 20:28
@mergify mergify bot added the merge-queue label Jan 15, 2025
@mergify mergify bot requested a review from edolstra as a code owner January 15, 2025 20:28
Copy link
Contributor Author

mergify bot commented Jan 15, 2025

Cherry-pick of 2512619 has failed:

On branch mergify/bp/2.24-maintenance/pr-11566
Your branch is ahead of 'origin/2.24-maintenance' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2512619cb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/manual/package.nix

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 20ee83f has failed:

On branch mergify/bp/2.24-maintenance/pr-11566
Your branch is ahead of 'origin/2.24-maintenance' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 20ee83fff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/nixos/default.nix

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Member

@edolstra edolstra left a comment

Choose a reason for hiding this comment

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

I feel that for maintenance branches we should be very conservative to avoid accidental breakage, and upgrading the major Nixpkgs version is not conservative - it tends to break things. So unless there is some critical security issue that isn't fixed on 24.05, I would prefer not to do this.

@szlend
Copy link
Member

szlend commented Jan 18, 2025

Note issue #12246, NixOS/nixpkgs#373692 (comment) before attempting updates to nixos-24.11

@roberth roberth added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts documentation merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants