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

[24.11] niri: 25.01 -> 25.02 #384921

Merged
merged 3 commits into from
Feb 25, 2025
Merged

[24.11] niri: 25.01 -> 25.02 #384921

merged 3 commits into from
Feb 25, 2025

Conversation

sodiboo
Copy link
Contributor

@sodiboo sodiboo commented Feb 25, 2025

Manual backport of #384183 and #384634.

cc @Schweber #384183 (comment)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Defelo and others added 3 commits February 25, 2025 01:16
@Defelo @sodiboo
niri: 25.01 -> 25.02
dd13ee7 
(cherry picked from commit 61ffcda)
@sodiboo
niri: remove XDG_RUNTIME_DIR in check phase
b267ca5 
no longer necessary:
YaLTeR/niri@0226d9a

(cherry picked from commit 5177d2e)
@Defelo @sodiboo
niri: add versionCheckHook
cc5eed6 
(cherry picked from commit 92a55af)
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 25, 2025
@sodiboo
Copy link
Contributor Author

sodiboo commented Feb 25, 2025

re; cherry-pick check failure

Difference between cc5eed6 and original 92a55af may warrant inspection.

this difference is because #382550 is missing on 24.11, so i've only picked out the part that works on 24.11, and renamed the commit accordingly.

@sodiboo sodiboo mentioned this pull request Feb 25, 2025
Merged
13 tasks
@getchoo getchoo added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Feb 25, 2025
@getchoo getchoo merged commit 5396023 into NixOS:release-24.11 Feb 25, 2025
28 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@getchoo getchoo getchoo approved these changes

@IogaMaster IogaMaster Awaiting requested review from IogaMaster

@foo-dogsquared foo-dogsquared Awaiting requested review from foo-dogsquared

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sodiboo @getchoo @Defelo