ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #157716 from bobby285271/pantheon

Browse Source 
Pantheon updates 2022-02-01
This commit is contained in:
Bobby Rong 2022-02-03 20:37:27 +08:00 committed by GitHub
commit 95dab32edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

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

3
nixos/modules/rename.nix
View File

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

13
nixos/modules/services/desktops/pantheon/files.nix
View File

@ -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 ];`")
];
}

1
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

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

4
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
View File

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

11
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
View File

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

18
pkgs/desktops/pantheon/default.nix
View File

@ -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 { };
@ -232,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
})
}

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
View File

@ -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;
})
];