pantheon.elementary-default-settings: 7.1.0 -> 8.0.2

https://github.com/elementary/default-settings/compare/7.1.0...8.0.2

nixos/modules/services/x11/desktop-managers/pantheon.nix

@@ -232,7 +232,7 @@ in
       ])) config.environment.pantheon.excludePackages;
 
       # Settings from elementary-default-settings
-      environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
+      environment.etc."gtk-4.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-4.0/settings.ini";
 
       xdg.mime.enable = true;
       xdg.icons.enable = true;

pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , meson
 , ninja
@@ -15,24 +14,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-default-settings";
-  version = "7.1.0";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "default-settings";
     rev = version;
-    sha256 = "sha256-j4K8qYwfu6/s4qnTSzwv6KRsk9f+Qr/l1bhLywKMHMU=";
+    sha256 = "sha256-vytjRlSXnC+cSIAn6v6wpoig4zjJZObGZ6MCLfsIwIA=";
   };
 
-  patches = [
-    # Add pantheon-portals.conf
-    # https://github.com/elementary/default-settings/pull/293
-    (fetchpatch {
-      url = "https://github.com/elementary/default-settings/commit/8201eeb6a356e6059b505756ef7a556a6848ad3b.patch";
-      sha256 = "sha256-qhGj7WQTAWJTC1kouUZhBWKqyO4hQWJghEhLVl8QVUM=";
-    })
-  ];
-
   nativeBuildInputs = [
     accountsservice
     dbus
@@ -46,19 +36,8 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "--sysconfdir=${placeholder "out"}/etc"
     "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"
-    "-Dplank-dockitems=false"
   ];
 
-  preInstall = ''
-    # Install our override for plank dockitems as the desktop file path is different.
-    schema_dir=$out/share/glib-2.0/schemas
-    install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override
-
-    # Our launchers that use paths at /run/current-system/sw/bin
-    mkdir -p $out/etc/skel/.config/plank/dock1
-    cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers
-  '';
-
   postFixup = ''
     # https://github.com/elementary/default-settings/issues/55
     rm -r $out/share/cups

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/gala-multitaskingview.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.appcenter.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.calendar.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.files.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.files.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.mail.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.mail.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.music.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.photos.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.settings.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.settings.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.tasks.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/io.elementary.videos.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem

@@ -1,2 +0,0 @@
-[PlankDockItemPreferences]
-Launcher=file:///run/current-system/sw/share/applications/org.gnome.Epiphany.desktop

pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override

@@ -1,2 +0,0 @@
-[net.launchpad.plank.dock.settings]
-dock-items=['gala-multitaskingview.dockitem','io.elementary.files.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.settings.dockitem','io.elementary.appcenter.dockitem']

pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix

@@ -4,7 +4,6 @@
 , elementary-default-settings
 , glib
 , gala
-, epiphany
 , gnome-settings-daemon
 , gtk3
 , elementary-dock
@@ -20,7 +19,6 @@ let
   gsettingsOverridePackages = [
     elementary-dock
     gnome-settings-daemon
-    epiphany
     gala
     gsettings-desktop-schemas
     gtk3