Skip to content

blanket: 0.6.0 -> 0.7.0#308444

Merged
wegank merged 2 commits intoNixOS:staging-nextfrom
afh:update-blanket
May 2, 2024
Merged

blanket: 0.6.0 -> 0.7.0#308444
wegank merged 2 commits intoNixOS:staging-nextfrom
afh:update-blanket

Conversation

@afh
Copy link
Member

@afh afh commented May 2, 2024

Description of changes

This PR supercedes #308159 and targets staging-next, because the changes require a newer libadwaita, which is only available with Gnome 46, which in Nix is currently only available on staging-next.
Update to 0.7.0 and modernize package as proposed by nix run github:NixOS/nixfmt.

Closes #308146

Things done

Moderni

  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

@afh
Copy link
Member Author

afh commented May 2, 2024

Friendly ping to @Aleksanaa, @JohnRTitor, and @NovaViper for reviewing and testing 🙂

@afh afh mentioned this pull request May 2, 2024
13 tasks
@JohnRTitor
Copy link
Member

@ofborg build blanket

@ofborg ofborg bot requested a review from onny May 2, 2024 07:18
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 2, 2024
Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

LGTM, Ofborg was able to build it successfully. (1) (2)

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 2, 2024
@Aleksanaa
Copy link
Member

Aleksanaa commented May 2, 2024

Hey, could you avoid double wrapping first? Although I've done it in #303848 I guess I won't work on that PR in a week

@wegank wegank merged commit 1723765 into NixOS:staging-next May 2, 2024
@afh afh deleted the update-blanket branch May 2, 2024 14:19
@afh
Copy link
Member Author

afh commented May 2, 2024

Unfortunately this PR was merged before I got a chance to reply to your comment, @Aleksanaa. I'm uncertain whether I fully understand what you mean by "double wrapping", can you provide additional context, please?

@Aleksanaa
Copy link
Member

Just see my above PR. The nixpkgs manual also mentioned this.

@afh
Copy link
Member Author

afh commented May 8, 2024

ℹ️ Double-wrapping was addressed with 63c8837

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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants