From ede5fff9295a9cfb1af5c54e6e983f6bd0c09722 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 1 Feb 2022 23:02:42 +0800 Subject: [PATCH 1/5] nixos/pantheon: stop setting GTK_CSD=1 See https://github.com/elementary/gala/issues/244 --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 980a6b939d5a..70911e02f7e0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -224,7 +224,6 @@ in programs.file-roller.package = pkgs.pantheon.file-roller; # Settings from elementary-default-settings - environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; xdg.portal.extraPortals = with pkgs.pantheon; [ From be1e44b7d2319b96973f0d7cad6db29ce4831478 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 09:47:36 +0800 Subject: [PATCH 2/5] pantheon.elementary-photos: 2.7.3 -> 2.7.4 --- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 55a42f806447..1ff9157b301b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY="; + sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; }; nativeBuildInputs = [ From 246f4949ede10370f98742e815172858509e4364 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 09:53:39 +0800 Subject: [PATCH 3/5] pkgs/pantheon: minor formatting Simply because all other Pantheon packages have addressed these formatting. --- .../pantheon/apps/elementary-videos/default.nix | 11 ++++++----- pkgs/desktops/pantheon/default.nix | 4 +++- .../desktop/wingpanel-indicators/power/default.nix | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 494b50605e97..cb1ea291225b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -40,21 +40,22 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ clutter-gst clutter-gtk elementary-icon-theme granite + gtk3 + libgee + libhandy + ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - libgee - libhandy - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 617c6ed086da..e005f08ba30a 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -161,7 +161,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; - wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { + inherit (gnome) gnome-power-manager; + }; wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 6c300536b2f8..ac9803495574 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , substituteAll , nix-update-script -, gnome +, gnome-power-manager , pkg-config , meson , python3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - gnome_power_manager = gnome.gnome-power-manager; + gnome_power_manager = gnome-power-manager; }) ]; From 9137abbea8bef42c6412eaf72682f6e00340ce64 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 10:04:13 +0800 Subject: [PATCH 4/5] pkgs/pantheon: remove old aliases This is mostly Pantheon version of e703bc0ade3b6a3669f77d0acede1c2047e51fc2, we move the aliases outside of the scope. --- pkgs/desktops/pantheon/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e005f08ba30a..29192a4dd80a 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -234,18 +234,20 @@ lib.makeScope pkgs.newScope (self: with self; { # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 -} // lib.optionalAttrs (config.allowAliases or true) { +}) // lib.optionalAttrs (config.allowAliases or true) { ### ALIASES - inherit (pkgs) vala; # added 2019-10-10 + # They need to be outside the scope or they will shadow the attributes from parent scope. - cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + vala = throw "The ‘pantheon.vala’ alias was removed on 2022-02-02, please use ‘pkgs.vala’ directly."; # added 2019-10-10 - elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21 + cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; # added 2020-04-06 + + elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 - inherit (pkgs) notes-up; # added 2021-12-18 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 -}) +} From 4fcca9b41fd46f2c67b282c3d79abffe2a72f730 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 10:27:08 +0800 Subject: [PATCH 5/5] nixos/pantheon/files: remove This shouldn't appear in search.nixos.org. --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 3 +++ nixos/modules/services/desktops/pantheon/files.nix | 13 ------------- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 nixos/modules/services/desktops/pantheon/files.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1e3b8f3099b6..c8b45724b3c1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -356,7 +356,6 @@ ./services/desktops/cpupower-gui.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix - ./services/desktops/pantheon/files.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 31538c422192..17ec13b770a8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -60,6 +60,9 @@ with lib; (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' + This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix deleted file mode 100644 index 8cee9f42b62f..000000000000 --- a/nixos/modules/services/desktops/pantheon/files.nix +++ /dev/null @@ -1,13 +0,0 @@ -# pantheon files daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - imports = [ - (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") - ]; - -}