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

niri: 25.01 -> 25.02 and refactor #384183

Merged
merged 2 commits into from
Feb 23, 2025
Merged

niri: 25.01 -> 25.02 and refactor #384183

merged 2 commits into from
Feb 23, 2025

Conversation

Defelo
Copy link
Member

@Defelo Defelo commented Feb 22, 2025

Changelog: https://github.com/YaLTeR/niri/releases/tag/v25.02

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.

@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 22, 2025
r-vdp
r-vdp approved these changes Feb 22, 2025
View reviewed changes
Copy link
Contributor

@r-vdp r-vdp left a comment

Choose a reason for hiding this comment

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

TIL that our rust builders support finalAttrs now, that's great.

Diff LGTM, I'll give it a try on my machine!

@Defelo
Copy link
Member Author

Defelo commented Feb 22, 2025

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 384183

Logs: https://github.com/Defelo/nixpkgs-review-gha/actions/runs/13471645884

Download packages from cache:
  • x86_64-linux 
    nix-store -r --add-root nixpkgs-pr-384183-x86_64-linux \
  --option binary-caches 'https://cache.nixos.org/ https://attic.defelo.de/nixpkgs' \
  --option trusted-public-keys '
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  nixpkgs:xeaAWa3crK09hMmFiygBeRmLq3hUjUShgaAwYVUEtw0=
  ' \
  /nix/store/m2i7agy3c8h6r1c005kr9jvr5w0g2chm-niri-25.02 \
  /nix/store/h84nzz92cwlbxkgfi17i7l9lw424d4xl-stardust-xr-kiara-0-unstable-2024-07-13
  • aarch64-linux 
    nix-store -r --add-root nixpkgs-pr-384183-aarch64-linux \
  --option binary-caches 'https://cache.nixos.org/ https://attic.defelo.de/nixpkgs' \
  --option trusted-public-keys '
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  nixpkgs:xeaAWa3crK09hMmFiygBeRmLq3hUjUShgaAwYVUEtw0=
  ' \
  /nix/store/zhg64qasq9fb229nj6kk8mjpfdv56qxm-niri-25.02 \
  /nix/store/nhb5j46zp1crwjxiq0fdfxf47a14fpj4-stardust-xr-kiara-0-unstable-2024-07-13

x86_64-linux

✅ 2 packages built:
  • niri
  • stardust-xr-kiara

aarch64-linux

✅ 2 packages built:
  • niri
  • stardust-xr-kiara

@Defelo Defelo added 8.has: package (update) This PR updates a package to a newer version backport release-24.11 Backport PR automatically labels Feb 22, 2025
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 22, 2025
getchoo
getchoo reviewed Feb 23, 2025
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

TIL buildRustPackage supports finalAttrs. Nice!

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 384183

aarch64-linux

✅ 2 packages built:
  • niri
  • stardust-xr-kiara

@Defelo Defelo requested a review from getchoo February 23, 2025 09:10
@getchoo getchoo added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label Feb 23, 2025
@isabelroses isabelroses added 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people labels Feb 23, 2025
@getchoo getchoo merged commit 0b3aa63 into NixOS:master Feb 23, 2025
28 of 30 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Feb 23, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-384183-to-release-24.11 origin/release-24.11
cd .worktree/backport-384183-to-release-24.11
git switch --create backport-384183-to-release-24.11
git cherry-pick -x 61ffcdafa9fe5f4e1237346ae521c038458254e5 92a55af5c56ef5d5ce31ad9c2a75e79fab4a1f88

@Defelo Defelo deleted the niri branch February 23, 2025 21:13
@sodiboo sodiboo mentioned this pull request Feb 24, 2025
Merged
13 tasks
This was referenced Feb 24, 2025
Closed
Closed
@Schweber Schweber added the 9.needs: port to stable A PR needs a backport to the stable release. label Feb 24, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Feb 24, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-384183-to-release-24.11 origin/release-24.11
cd .worktree/backport-384183-to-release-24.11
git switch --create backport-384183-to-release-24.11
git cherry-pick -x 61ffcdafa9fe5f4e1237346ae521c038458254e5 92a55af5c56ef5d5ce31ad9c2a75e79fab4a1f88

@Schweber
Copy link
Contributor

Can one of you please create a manual backport? I failed miserably in #384707 and #384710

@sodiboo sodiboo mentioned this pull request Feb 25, 2025
Merged
13 tasks
@sodiboo
Copy link
Contributor

sodiboo commented Feb 25, 2025

Can one of you please create a manual backport? I failed miserably in #384707 and #384710

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@r-vdp r-vdp r-vdp approved these changes

@sodiboo sodiboo sodiboo approved these changes

@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
8.has: package (update) This PR updates a package to a newer version 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Defelo @Schweber @sodiboo @r-vdp @getchoo @wegank @isabelroses