From 39cce2f144d34ee29dbfe6de4387b7c75097bc70 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 31 Dec 2020 18:11:24 +0100 Subject: [PATCH 1/3] Revert "nixos/gnome3: don't install epiphany default" This reverts commit 13b192749c2312683ad5db285de66f0352b67f98, since https://github.com/NixOS/nixpkgs/issues/98819 is now fixed. --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 68a65d77d62..c8364cb12c4 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -409,9 +409,7 @@ in baobab cheese eog - /* Not in good standing on nixos: - * https://github.com/NixOS/nixpkgs/issues/98819 - /* epiphany */ + epiphany gedit gnome-calculator gnome-calendar From 6a12654363c85bc903f0d2f17f1508b9b939129d Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 5 Jan 2021 16:09:07 +0100 Subject: [PATCH 2/3] Revert "nixos/gnome3: don't put epiphany in favorite apps" This reverts commit 70dc25abd9a63ca3839c08bba8cba9e7bc974b04. --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c8364cb12c4..a36a47d376b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -19,7 +19,7 @@ let defaultFavoriteAppsOverride = '' [org.gnome.shell] - favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] ''; nixos-gsettings-desktop-schemas = let From 8ed99878944d3c0901ddb2733d156f1d4e987d96 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 5 Jan 2021 16:27:20 +0100 Subject: [PATCH 3/3] nixos/gnome3: Note the reintroduction of epiphany in release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2103.xml | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3da8080958e..0b1d0d509d7 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1343,6 +1343,14 @@ CREATE ROLE postgres LOGIN SUPERUSER; It was chosen to do this as it has a usability breaking issue (see issue #98819) that makes it unsuitable to be a default app. + + + Issue #98819 + is now fixed and gnome3.epiphany is once + again installed by default. + + diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 38262b50899..ca070f7cce0 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -446,6 +446,11 @@ The option's description was incorrect regarding ownership management and has been simplified greatly. + + + The GNOME desktop manager once again installs gnome3.epiphany by default. + +