From 6f23ca82bd169d6f169d64e359bb80311a410068 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 17 May 2022 19:17:46 +0800
Subject: [PATCH 1/8] nixos/pantheon: use pantheon.gnome-settings-daemon
pantheon.gnome-settings-daemon *is* gnome.gnome-settings-daemon338,
doing this so I don't need to update this on every GSD update.
---
nixos/modules/services/x11/desktop-managers/pantheon.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 004d14b634d4..7db031b04c40 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -167,10 +167,10 @@ in
isSystem = true;
};
services.udev.packages = [
- pkgs.gnome.gnome-settings-daemon338
+ pkgs.pantheon.gnome-settings-daemon
];
systemd.packages = [
- pkgs.gnome.gnome-settings-daemon338
+ pkgs.pantheon.gnome-settings-daemon
];
programs.dconf.enable = true;
networking.networkmanager.enable = mkDefault true;
@@ -216,7 +216,7 @@ in
pantheon-agent-polkit
]) ++ (utils.removePackagesByName [
gnome.gnome-font-viewer
- gnome.gnome-settings-daemon338
+ pantheon.gnome-settings-daemon
] config.environment.pantheon.excludePackages);
programs.evince.enable = mkDefault true;
From b93b4f71f21e4ff931d669f02cbabe04412d8965 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:19:34 +0800
Subject: [PATCH 2/8] nixos/pantheon: also treat gnome-font-viewer as non-core
apps
---
.../services/x11/desktop-managers/pantheon.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 7db031b04c40..cdf5a0ce0880 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -212,12 +212,10 @@ in
elementary-capnet-assist
elementary-notifications
elementary-settings-daemon
+ gnome-settings-daemon
pantheon-agent-geoclue2
pantheon-agent-polkit
- ]) ++ (utils.removePackagesByName [
- gnome.gnome-font-viewer
- pantheon.gnome-settings-daemon
- ] config.environment.pantheon.excludePackages);
+ ]);
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
@@ -272,7 +270,9 @@ in
})
(mkIf serviceCfg.apps.enable {
- environment.systemPackages = with pkgs.pantheon; utils.removePackagesByName ([
+ environment.systemPackages = utils.removePackagesByName ([
+ pkgs.gnome.gnome-font-viewer
+ ] ++ (with pkgs.pantheon; [
elementary-calculator
elementary-calendar
elementary-camera
@@ -290,7 +290,7 @@ in
# Only install appcenter if flatpak is enabled before
# https://github.com/NixOS/nixpkgs/issues/15932 is resolved.
appcenter
- ]) config.environment.pantheon.excludePackages;
+ ])) config.environment.pantheon.excludePackages;
# needed by screenshot
fonts.fonts = [
From c601126bc84d5ce74c5f271210c0f3000dc6d5dc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:24:43 +0800
Subject: [PATCH 3/8] nixos/pantheon: enable power-profiles-daemon
switchboard-plug-power is providing support for this since 2.7.0.
Note that we don't handle the conflict with tlp because we have
no way of knowing which way a user wants to resolve the conflict.
---
nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index cdf5a0ce0880..8983bc5d7582 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -136,6 +136,7 @@ in
services.colord.enable = mkDefault true;
services.fwupd.enable = mkDefault true;
services.packagekit.enable = mkDefault true;
+ services.power-profiles-daemon.enable = mkDefault true;
services.touchegg.enable = mkDefault true;
services.touchegg.package = pkgs.pantheon.touchegg;
services.tumbler.enable = mkDefault true;
From 5449a8654895f262a176e251b6fec7ffe10c0a43 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:33:35 +0800
Subject: [PATCH 4/8] pantheon.switchboard-plug-power: 2.6.0 -> 2.7.0
---
.../pantheon/apps/switchboard-plugs/power/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 2a531815f875..d0079e6a0571 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-power";
- version = "2.6.0";
+ version = "2.7.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr";
+ sha256 = "sha256-8Hu2RIgA0gSc+tLNjDqGS+b/HpbsOdR4otpY4UqNzKs=";
};
nativeBuildInputs = [
From 5d6c1f37d4dea8dbfd530cb58edbf46afe716a47 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:37:44 +0800
Subject: [PATCH 5/8] pantheon.elementary-terminal: 6.0.1 -> 6.0.2
---
.../apps/elementary-terminal/default.nix | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index fe6e5a40fa4d..aa3d9981998c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -10,41 +9,28 @@
, vala
, desktop-file-utils
, gtk3
-, libxml2
, granite
, libhandy
, libnotify
, vte
, libgee
-, appstream
, pcre2
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-terminal";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "terminal";
rev = version;
- sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";
+ sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI=";
};
- patches = [
- # Fix build with meson 0.61
- # https://github.com/elementary/terminal/pull/649
- (fetchpatch {
- url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch";
- sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg=";
- })
- ];
-
nativeBuildInputs = [
- appstream
desktop-file-utils
- libxml2
meson
ninja
pkg-config
From cb6efa07d009c16ba5a174a7f7d391e2636b2084 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:41:00 +0800
Subject: [PATCH 6/8] pantheon.elementary-capnet-assist: 2.4.1 -> 2.4.2
---
.../pantheon/services/elementary-capnet-assist/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 24ce7b5ad56b..734538259130 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "capnet-assist";
rev = version;
- sha256 = "sha256-8hhp37EBzZxEVvPaRw9PohjaPWKQZ/AfqqvwLxQCBKk=";
+ sha256 = "sha256-aA71kxu4/dwODZt+DSp3vvely3P0dL23Ykqhd84hrZw=";
};
nativeBuildInputs = [
From 7541871c1d66e6ed837565391f27de3ce671a269 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:45:13 +0800
Subject: [PATCH 7/8] pantheon.elementary-calendar: 6.1.0 -> 6.1.1
---
.../pantheon/apps/elementary-calendar/default.nix | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index f3bd37b00e06..1984a6ebbe24 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -2,8 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
-, appstream-glib
-, desktop-file-utils
, meson
, ninja
, pkg-config
@@ -25,18 +23,16 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
- version = "6.1.0";
+ version = "6.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "calendar";
rev = version;
- sha256 = "sha256-LaVJ7QLc0UdSLgLIuHP4Anc7kPUelZW9PnIWuqKGtEQ=";
+ sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo=";
};
nativeBuildInputs = [
- appstream-glib
- desktop-file-utils
meson
ninja
pkg-config
From 48358d8a7112ec7419f1fbd51cc7b6b1de306738 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 May 2022 13:46:25 +0800
Subject: [PATCH 8/8] pantheon.elementary-settings-daemon: 1.1.0 -> 1.2.0
---
.../pantheon/services/elementary-settings-daemon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index ff0cc92da338..a57d14d2f40c 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "settings-daemon";
rev = version;
- sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI=";
+ sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o=";
};
nativeBuildInputs = [