alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #173459 from bobby285271/pantheon-updates

Browse source 
Pantheon 7 updates 2022-05-18
This commit is contained in:
Bobby Rong 2022-05-20 13:12:39 +08:00 committed by GitHub
parent c4f3c4e1d8 48358d8a71
commit cee75cb765
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nixos/modules/services/x11/desktop-managers/pantheon.nix
View file

@ -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;
@ -167,10 +168,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;
@ -212,12 +213,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
gnome.gnome-settings-daemon338
] config.environment.pantheon.excludePackages);
]);
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
@ -272,7 +271,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 +291,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 = [

8
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View file

@ -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

18
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View file

@ -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

4
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
View file

@ -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 = [

4
pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
View file

@ -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 = [

4
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
View file

@ -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 = [