jahanson/forgejo-ci-runners
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update nixpkgs to nixos-24.11 #107

Open
smeagol-help wants to merge 1 commit from renovate/nixpkgs-24.x into main
pull from: renovate/nixpkgs-24.x
merge into: jahanson:main
Conversation 0 Commits 1 Files changed 2 +5 -5
smeagol-help commented 2024-11-17 23:32:13 -06:00
Collaborator
Copy link

This PR contains the following updates:

Package Update Change
nixpkgs minor nixos-24.05 -> nixos-24.11

Release Notes

NixOS/nixpkgs (nixpkgs)

vnixos-24.11

Compare Source

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot.

This PR contains the following updates: | Package | Update | Change | |---|---|---| | [nixpkgs](https://github.com/NixOS/nixpkgs) | minor | `nixos-24.05` -> `nixos-24.11` | --- ### Release Notes <details> <summary>NixOS/nixpkgs (nixpkgs)</summary> ### [`vnixos-24.11`](https://github.com/NixOS/nixpkgs/compare/nixos-24.05...nixos-24.11) [Compare Source](https://github.com/NixOS/nixpkgs/compare/nixos-24.05...nixos-24.11) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xOS4xIiwidXBkYXRlZEluVmVyIjoiMzkuMTkuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
smeagol-help added 1 commit 2024-11-17 23:32:13 -06:00
Update nixpkgs to nixos-24.11
Some checks failed
Build on PR / nix-build (fj-shadowfax-01, native-x86_64, x86_64-linux) (pull_request) Failing after 59s
Details
Build on PR / nix-build (fj-hetzner-aarch64-01, native-aarch64, aarch64-linux) (pull_request) Has been cancelled
Details
dd596a72f1
Some checks failed
Build on PR / nix-build (fj-shadowfax-01, native-x86_64, x86_64-linux) (pull_request) Failing after 59s
Details
Build on PR / nix-build (fj-hetzner-aarch64-01, native-aarch64, aarch64-linux) (pull_request) Has been cancelled
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin renovate/nixpkgs-24.x:renovate/nixpkgs-24.x
git checkout renovate/nixpkgs-24.x

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff renovate/nixpkgs-24.x
git checkout renovate/nixpkgs-24.x
git rebase main
git checkout main
git merge --ff-only renovate/nixpkgs-24.x
git checkout renovate/nixpkgs-24.x
git rebase main
git checkout main
git merge --no-ff renovate/nixpkgs-24.x
git checkout main
git merge --squash renovate/nixpkgs-24.x
git checkout main
git merge --ff-only renovate/nixpkgs-24.x
git checkout main
git merge renovate/nixpkgs-24.x
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: jahanson/forgejo-ci-runners#107
No description provided.
Delete branch "renovate/nixpkgs-24.x"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?