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 #150634

Merged
merged 26 commits into from
Dec 20, 2021
Merged

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Dec 14, 2021

Motivation for this change

This is the Pantheon backport pull request for the elementary OS 6.1 Jólnir release cycle.

The following commit has been excluded from backport:

Related: planned backport workflow for 6.1, release notes per package, OS 6.1 project board.

Notable changes
  • appcenter should work again (downstream issue).
  • wingpanel-indicator-ayatana (unsupported third-party indicator) has been packaged.
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 150634
  1. Save the following NixOS configuration file as configuration.nix, you can save the file to any directory.
{ pkgs, config, ... }: {
  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.

@bobby285271 bobby285271 added 2.status: wait-for-upstream Waiting for upstream fix (or their other action). 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. labels Dec 14, 2021
@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 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 Dec 14, 2021
@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: 11-100 labels Dec 14, 2021
@ofborg ofborg bot requested a review from ethancedwards8 December 14, 2021 04:19
@bobby285271 bobby285271 marked this pull request as ready for review December 16, 2021 12:41
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Dec 18, 2021
@bobby285271 bobby285271 marked this pull request as draft December 18, 2021 10:48
@bobby285271 bobby285271 removed the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Dec 20, 2021
(cherry picked from commit 01bc1d1)
(cherry picked from commit 508d45f)
It makes no sense to wait any longer as the app is totally not working specifically on NixOS.

(cherry picked from commit 3aa4359)
This reverts commit cd58f44.

(cherry picked from commit 1eef9ae)
(cherry picked from commit a519581)
(cherry picked from commit 42e445f)
(cherry picked from commit 52f2c25)
@bobby285271
Copy link
Member Author

@ofborg test pantheon

@bobby285271
Copy link
Member Author

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

1 package marked as broken and skipped:
  • pantheon.elementary-screenshot-tool
2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
40 packages built:
  • monitor
  • pantheon-tweaks
  • pantheon.appcenter
  • pantheon.elementary-calculator
  • pantheon.elementary-camera
  • pantheon.elementary-dock
  • pantheon.elementary-files
  • pantheon.elementary-greeter
  • pantheon.elementary-gsettings-schemas
  • pantheon.elementary-mail
  • pantheon.elementary-onboarding
  • pantheon.elementary-screenshot
  • pantheon.elementary-session-settings
  • pantheon.elementary-tasks
  • pantheon.elementary-terminal
  • pantheon.elementary-videos
  • pantheon.elementary-wallpapers
  • pantheon.evince
  • pantheon.gala
  • pantheon.switchboard-plug-a11y
  • pantheon.switchboard-plug-mouse-touchpad
  • pantheon.switchboard-plug-onlineaccounts
  • pantheon.switchboard-plug-pantheon-shell
  • pantheon.switchboard-plug-power
  • pantheon.switchboard-plug-security-privacy
  • pantheon.switchboard-with-plugs
  • pantheon.wingpanel
  • pantheon.wingpanel-applications-menu
  • pantheon.wingpanel-indicator-a11y
  • pantheon.wingpanel-indicator-bluetooth
  • pantheon.wingpanel-indicator-datetime
  • pantheon.wingpanel-indicator-keyboard
  • pantheon.wingpanel-indicator-network
  • pantheon.wingpanel-indicator-nightlight
  • pantheon.wingpanel-indicator-notifications
  • pantheon.wingpanel-indicator-power
  • pantheon.wingpanel-indicator-session
  • pantheon.wingpanel-indicator-sound
  • pantheon.wingpanel-with-indicators
  • wingpanel-indicator-ayatana

@bobby285271 bobby285271 marked this pull request as ready for review December 20, 2021 06:58
@bobby285271 bobby285271 merged commit 8645305 into NixOS:release-21.11 Dec 20, 2021
@bobby285271 bobby285271 deleted the pantheon-stable branch December 20, 2021 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 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: package (new) This PR adds a new package 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: 11-100 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