git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #157716 from bobby285271/pantheon

Pantheon updates 2022-02-01

commit95dab32edc2e82bb8aaf81cbf41dfacbf35aa605 authorBobby Rong <rjl931189261@126.com> dateThu 3 Feb 2022, 20:37 (5 years ago) parent4a6f3524fcca9b
8 files changed+24−31
compare with master
unifiedsplit
nixos/modules/module-list.nix−1 nixos/modules/rename.nix+3 nixos/modules/services/desktops/pantheon/files.nix−13 nixos/modules/services/x11/desktop-managers/pantheon.nix−1 pkgs/desktops/pantheon/apps/elementary-photos/default.nix+2−2 pkgs/desktops/pantheon/apps/elementary-videos/default.nix+6−5 pkgs/desktops/pantheon/default.nix+11−7 pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix+2−2
nixos/modules/module-list.nix−1
@@ -356,7 +356,6 @@
356356 ./services/desktops/cpupower-gui.nix
357357 ./services/desktops/dleyna-renderer.nix
358358 ./services/desktops/dleyna-server.nix
359− ./services/desktops/pantheon/files.nix
360359 ./services/desktops/espanso.nix
361360 ./services/desktops/flatpak.nix
362361 ./services/desktops/geoclue2.nix
nixos/modules/rename.nix+3
@@ -60,6 +60,9 @@ with lib;
6060 (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.")
6161 (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
6262 (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
63+ (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
64+ This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
65+ '')
6366 (mkRemovedOptionModule [ "services" "prey" ] ''
6467 prey-bash-client is deprecated upstream
6568 '')
nixos/modules/services/desktops/pantheon/files.nixdeleted−13
@@ -1,13 +0,0 @@
1−# pantheon files daemon.
2−
3−{ config, pkgs, lib, ... }:
4−
5−with lib;
6−
7−{
8−
9− imports = [
10− (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`")
11− ];
12−
13−}
nixos/modules/services/x11/desktop-managers/pantheon.nix−1
@@ -224,7 +224,6 @@ in
224224 programs.file-roller.package = pkgs.pantheon.file-roller;
225225
226226 # Settings from elementary-default-settings
227− environment.sessionVariables.GTK_CSD = "1";
228227 environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
229228
230229 xdg.portal.extraPortals = with pkgs.pantheon; [
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+2−2
@@ -32,13 +32,13 @@
3232
3333stdenv.mkDerivation rec {
3434 pname = "elementary-photos";
35− version = "2.7.3";
35+ version = "2.7.4";
3636
3737 src = fetchFromGitHub {
3838 owner = "elementary";
3939 repo = "photos";
4040 rev = version;
41− sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY=";
41+ sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI=";
4242 };
4343
4444 nativeBuildInputs = [
pkgs/desktops/pantheon/apps/elementary-videos/default.nix+6−5
@@ -40,21 +40,22 @@ stdenv.mkDerivation rec {
4040 wrapGAppsHook
4141 ];
4242
43− buildInputs = with gst_all_1; [
43+ buildInputs = [
4444 clutter-gst
4545 clutter-gtk
4646 elementary-icon-theme
4747 granite
48+ gtk3
49+ libgee
50+ libhandy
51+ ] ++ (with gst_all_1; [
4852 gst-libav
4953 gst-plugins-bad
5054 gst-plugins-base
5155 gst-plugins-good
5256 gst-plugins-ugly
5357 gstreamer
54− gtk3
55− libgee
56− libhandy
57− ];
58+ ]);
5859
5960 postPatch = ''
6061 chmod +x meson/post_install.py
pkgs/desktops/pantheon/default.nix+11−7
@@ -161,7 +161,9 @@ lib.makeScope pkgs.newScope (self: with self; {
161161
162162 wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { };
163163
164− wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { };
164+ wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power {
165+ inherit (gnome) gnome-power-manager;
166+ };
165167
166168 wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { };
167169
@@ -232,18 +234,20 @@ lib.makeScope pkgs.newScope (self: with self; {
232234 # Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
233235 # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
234236
235−} // lib.optionalAttrs (config.allowAliases or true) {
237+}) // lib.optionalAttrs (config.allowAliases or true) {
236238
237239 ### ALIASES
238240
239− inherit (pkgs) vala; # added 2019-10-10
241+ # They need to be outside the scope or they will shadow the attributes from parent scope.
242+
243+ vala = throw "The ‘pantheon.vala’ alias was removed on 2022-02-02, please use ‘pkgs.vala’ directly."; # added 2019-10-10
240244
241− cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
245+ cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; # added 2020-04-06
242246
243− elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21
247+ 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
244248
245249 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
246250
247− inherit (pkgs) notes-up; # added 2021-12-18
251+ notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18
248252
249−})
253+}
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix+2−2
@@ -3,7 +3,7 @@
33, fetchFromGitHub
44, substituteAll
55, nix-update-script
6−, gnome
6+, gnome-power-manager
77, pkg-config
88, meson
99, python3
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 patches = [
3434 (substituteAll {
3535 src = ./fix-paths.patch;
36− gnome_power_manager = gnome.gnome-power-manager;
36+ gnome_power_manager = gnome-power-manager;
3737 })
3838 ];
3939