From d4ceef288e3366d3e8f0662e4ec26b4da4e29be7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <address@hidden>
Date: Thu, 26 Dec 2019 11:18:50 -0500
Subject: [PATCH] gnu: Revise gnome.

* gnu/packages/gnome.scm (gnome). Revision.

Revision done according to https://calc.disroot.org/2nu6mpf88ynq.html
---
 gnu/packages/gnome.scm | 87 ++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9f657d6de2..196950eb51 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7189,50 +7189,53 @@ associations for GNOME.")
     (build-system trivial-build-system)
     (arguments '(#:builder (begin (mkdir %output) #t)))
     (propagated-inputs
-     ;; TODO: Revise packages according to:
+     ;; TODO: Add or remove packages according to:
      ;;       <https://calc.disroot.org/2nu6mpf88ynq.html>.
-     `(("accountsservice"           ,accountsservice)
-       ("adwaita-icon-theme"        ,adwaita-icon-theme)
-       ("baobab"                    ,baobab)
-       ("cheese"                    ,cheese)
-       ("eog"                       ,eog)
-       ("epiphany"                  ,epiphany)
-       ("evince"                    ,evince)
-       ("file-roller"               ,file-roller)
-       ("gdm"                       ,gdm
-       ("gedit"                     ,gedit)
-       ("glib-networking"           ,glib-networking)
-       ("gnome-backgrounds"         ,gnome-backgrounds)
-       ("gnome-bluetooth"           ,gnome-bluetooth)
-       ("gnome-calculator"          ,gnome-calculator)
-       ("gnome-calendar"            ,gnome-calendar)
-       ("gnome-characters"          ,gnome-characters)
-       ("gnome-clocks"              ,gnome-clocks)
-       ("gnome-contacts"            ,gnome-contacts)
-       ("gnome-control-center"      ,gnome-control-center)
-       ("gnome-desktop"             ,gnome-desktop)
-       ("gnome-disk-utility"        ,gnome-disk-utility)
-       ("gnome-font-viewer"         ,gnome-font-viewer)
-       ("gnome-keyring"             ,gnome-keyring)
-       ("gnome-maps"                ,gnome-maps)
-       ("gnome-screenshot"          ,gnome-screenshot)
-       ("gnome-session"             ,gnome-session)
-       ("gnome-settings-daemon"     ,gnome-settings-daemon)
-       ("gnome-shell"               ,gnome-shell)
-       ("gnome-shell-extensions"    ,gnome-shell-extensions)
-       ("gnome-system-monitor"      ,gnome-system-monitor)
-       ("gnome-terminal"            ,gnome-terminal)
+     ;; GNOME-Core-OS-Services
+     `(("accountsservice" ,accountsservice)
+       ("network-manager" ,network-manager)
+       ("packagekit" ,packagekit)
+       ("upower" ,upower))
+     ;; GNOME-Core-Shell
+     `(("adwaita-icon-theme" ,adwaita-icon-theme)
+       ("gdm" ,gdm)
+       ("glib-networking" ,glib-networking)
+       ("gnome-backgrounds" ,gnome-backgrounds)
+       ("gnome-bluetooth" ,gnome-bluetooth)
+       ("gnome-control-center" ,gnome-control-center)
+       ("gnome-desktop" ,gnome-desktop)
+       ("gnome-keyring" ,gnome-keyring)
+       ("gnome-session" ,gnome-session)
+       ("gnome-settings-daemon" ,gnome-settings-daemon)
+       ("gnome-shell-extensions" ,gnome-shell-extensions)
+       ("gnome-shell" ,gnome-shell)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("gvfs"                      ,gvfs)
-       ("mutter"                    ,mutter)
-       ("nautilus"                  ,nautilus)
-       ("network-manager"           ,network-manager)
-       ("orca"                      ,orca)
-       ("packagekit"                ,packagekit)
-       ("simple-scan"               ,simple-scan)
-       ("totem"                     ,totem)
-       ("upower"                    ,upower)
-       ("yelp"                      ,yelp)))
+       ("gvfs" ,gvfs)
+       ("mutter" ,mutter)
+       ("orca" ,orca))
+     ;; GNOME-Core-Utilities
+     `(("baobab" ,baobab)
+       ("cheese" ,cheese)
+       ("eog" ,eog)
+       ("epiphany" ,epiphany)
+       ("envice" ,envice)
+       ("file-roller" ,file-roller)
+       ("gedit" ,gedit)
+       ("gnome-calculator" ,gnome-calculator)
+       ("gnome-calendar" ,gnome-calendar)
+       ("gnome-characters" ,gnome-characters)
+       ("gnome-clocks" ,gnome-clocks)
+       ("gnome-contacts" ,gnome-contacts)
+       ("gnome-disk-utility" ,gnome-disk-utility)
+       ("gnome-font-viewer" ,gnome-font-viewer)
+       ("gnome-maps" ,gnome-maps)
+       ("gnome-screenshot" ,gnome-screenshot)
+       ("gnome-system-monitor" ,gnome-system-monitor)
+       ("gnome-terminal" ,gnome-terminal)
+       ("nautilus" ,nautilus)
+       ("simple-scan" ,simple-scan)
+       ("totem" ,totem)
+       ("yelp" ,yelp)))
     (synopsis "The GNU desktop environment")
     (home-page "https://www.gnome.org/")
     (description
-- 
2.24.1