Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #143513 from bobby285271/pantheon

Pantheon updates 2021-10-28

authored by

Bobby Rong and committed by
GitHub
3f33a306 be1f9391

+8 -6
+1
nixos/modules/services/x11/desktop-managers/pantheon.nix
··· 283 283 elementary-music 284 284 elementary-photos 285 285 elementary-screenshot 286 + elementary-tasks 286 287 elementary-terminal 287 288 elementary-videos 288 289 epiphany
+2 -3
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
··· 60 60 ''; 61 61 62 62 preInstall = '' 63 - # Install our override for plank dockitems as Appcenter and Tasks is not ready to be preinstalled. 64 - # For Appcenter, see: https://github.com/NixOS/nixpkgs/issues/70214. 65 - # For Tasks, see: https://github.com/elementary/tasks/issues/243#issuecomment-846259496 63 + # Install our override for plank dockitems as Appcenter is not ready to be preinstalled. 64 + # See: https://github.com/NixOS/nixpkgs/issues/70214. 66 65 schema_dir=$out/share/glib-2.0/schemas 67 66 install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override 68 67
+2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem
··· 1 + [PlankDockItemPreferences] 2 + Launcher=file:///run/current-system/sw/share/applications/io.elementary.tasks.desktop
+1 -1
pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
··· 1 1 [net.launchpad.plank.dock.settings] 2 - dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] 2 + dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
+2 -2
pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "xdg-desktop-portal-pantheon"; 20 - version = "1.0.0"; 20 + version = "1.0.1"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "elementary"; 24 24 repo = "portals"; 25 25 rev = version; 26 - sha256 = "sha256-uPZUeyyn7HZwcBksY6X5s1bpbIRwqdCNfZKnkynVD+8="; 26 + sha256 = "sha256-8gBMjCMEzrFmKHhkXsgcIESC93EOT0ADkRUIJMmerjw="; 27 27 }; 28 28 29 29 nativeBuildInputs = [