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

[21.11] Pantheon 6.1 backports 2022-02-24 #161642

Merged
merged 5 commits into from
Mar 3, 2022

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Feb 24, 2022

Motivation for this change

Monthly Pantheon update backport for 21.11. Upstream is shifting focus to Pantheon 7 so there is mostly no work for us.

I am excluding the appcenter patch drop from backport as I live on nixos-unstable when I don't test nixos-21.11 pantheon bumps and unfortunately I have no time to test the appcenter patch drop with the old packagekit shipped in nixos-21.11, though things should work...

Good news is that the greeter crash has been fixed on upstream a few hours ago.

Previous stable channel backport pull request
How to test on NixOS

For flakes enabled system, you can also try bobby285271/test-pantheon.

  1. Clone the NixOS/nixpkgs repository and checkout to this PR, you can use the GitHub CLI tool gh.
$ gh repo clone NixOS/nixpkgs
$ cd nixpkgs
$ gh pr checkout 161642
  1. Save the following NixOS configuration file as configuration.nix, you can save the file to any directory.
{ modulesPath, pkgs, config, ... }: {
  imports = [
    "${modulesPath}/virtualisation/qemu-vm.nix"
  ];

  environment.enableDebugInfo = true;
  services.xserver = {
    enable = true;
    layout = "us";
    desktopManager.pantheon.enable = true;
    desktopManager.pantheon.debug = true;
  };

  users.mutableUsers = false;

  users.extraUsers.test = {
    isNormalUser = true;
    uid = 1000;
    extraGroups = [ "wheel" "networkmanager" ];
    password = "test";
  };
  nixpkgs.config.allowAliases = false;

  virtualisation.qemu.options = [ "-device intel-hda -device hda-duplex" ];
  virtualisation.memorySize = 2048;
  virtualisation.diskSize = 8192;
}
  1. Run the following command to build the packages and create a virtual machine with the above configuration. Do not forget to adjust the path to the nixpkgs checkout (/path/to/nixpkgs) and the configuration (/path/to/configuration.nix). It will take some time to build the packages, so grab some coffee while waiting.
$ env NIX_PATH=nixpkgs=/path/to/nixpkgs:nixos-config=/path/to/configuration.nix nixos-rebuild build-vm
  1. You should see a message like this, run the command provided by the output:
Done. The virtual machine can be started by running /nix/store/...-nixos-vm/bin/run-nixos-vm
  1. A QEMU virtual machine will be launched, wait for LightDM to start and login with the password test.

  2. Test the upgrade and if you find anything wrong, please also try reproduce the issue on master then comment here with your findings so we can handle that properly (i.e. we will drop the commit here that introduces major regressions).

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 24, 2022
@bobby285271 bobby285271 marked this pull request as draft February 24, 2022 10:28
@ofborg ofborg bot requested a review from davidak February 24, 2022 10:33
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 24, 2022
@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 24, 2022
@bobby285271 bobby285271 marked this pull request as ready for review March 3, 2022 13:01
…t 566"

This reverts commit 34d5d14.

(cherry picked from commit 2a376bb)
Fixed a use-after-free issue where logged_in_context is used in update_style().
There are several reports for this but upstream has no action for this so far during the 6.x cycle.
See the provided link for more details.

(cherry picked from commit f29955d)

Note: the above is the original commit message, the patch has been accepted on upstream.
@bobby285271
Copy link
Member Author

@ofborg test pantheon

@bobby285271
Copy link
Member Author

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

2 packages built:
  • pantheon.elementary-greeter
  • pantheon.elementary-photos

@bobby285271 bobby285271 merged commit ba8466b into NixOS:release-21.11 Mar 3, 2022
@bobby285271 bobby285271 deleted the pantheon-stable branch March 3, 2022 14:10
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: module (update) This PR changes an existing module in `nixos/` 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
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant