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

Pantheon updates 2022-02-01 #157716

Merged
merged 5 commits into from
Feb 3, 2022
Merged

Pantheon updates 2022-02-01 #157716

merged 5 commits into from
Feb 3, 2022

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Feb 1, 2022

Motivation for this change

Pantheon 6.1 follow-ups (previous one at #156936)

GTK_CSD=1 has been dropped by upstream since elementary OS 6, see elementary/gala#244 and elementary/default-settings#103, I think issues mentioned in 399ff42 are no longer there. To test, build and run https://github.com/bobby285271/test-gtk-csd before and after the change.

Also some minor cleanups and formats. Easier to review commit by commit.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 8.has: module (update) This PR changes an existing module in `nixos/` labels Feb 1, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 1, 2022
@bobby285271 bobby285271 marked this pull request as ready for review February 2, 2022 01:19
@bobby285271 bobby285271 marked this pull request as draft February 2, 2022 01:36
@bobby285271 bobby285271 changed the title nixos/pantheon: stop setting GTK_CSD=1 Pantheon updates 2021-02-01 Feb 2, 2022
@bobby285271 bobby285271 changed the title Pantheon updates 2021-02-01 Pantheon updates 2022-02-01 Feb 2, 2022
@ofborg ofborg bot requested a review from davidak February 2, 2022 03:07
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Feb 2, 2022
@bobby285271 bobby285271 requested a review from jtojnar February 2, 2022 03:48
@bobby285271 bobby285271 marked this pull request as ready for review February 2, 2022 03:48
@github-actions github-actions bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Feb 2, 2022
Simply because all other Pantheon packages have addressed these formatting.
This is mostly Pantheon version of e703bc0,
we move the aliases outside of the scope.
This shouldn't appear in search.nixos.org.
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 2, 2022
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 2, 2022
@bobby285271
Copy link
Member Author

Result of nixpkgs-review pr 157716 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
2 packages built:
  • pantheon.elementary-photos
  • pantheon.elementary-videos

@bobby285271
Copy link
Member Author

bobby285271 commented Feb 3, 2022

@ofborg test pantheon

I think I need to figure out why we disable plugins for elementary-photos at initial packaging... Tracked as https://github.com/NixOS/nixpkgs/projects/21#card-77112141

@bobby285271 bobby285271 added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Feb 3, 2022
@github-actions github-actions bot removed 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Feb 3, 2022
@bobby285271
Copy link
Member Author

bobby285271 commented Feb 3, 2022

I dropped 0b5e0222ba4f830cd31abf74f8fa1d44bd55d3de as I consider removing the module without a review is dangerous... Going to merge this, waiting for ofborg eval

@bobby285271 bobby285271 merged commit 95dab32 into NixOS:master Feb 3, 2022
@bobby285271 bobby285271 deleted the pantheon branch February 3, 2022 12:37
@bobby285271
Copy link
Member Author

21.11 backport for ede5fff and be1e44b happens in #161642

@bobby285271 bobby285271 mentioned this pull request Mar 1, 2022
13 tasks
@bobby285271 bobby285271 added the 8.has: port to stable A PR already has a backport to the stable release. label Mar 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: port to stable A PR already has a backport to the stable release. 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant