From a0aca4e0c3e2ac669bf23975bca7bbe8bab55e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 22:09:52 -0300 Subject: [PATCH 1/8] gnome2.gnome_icon_theme: 2.91.93 -> 3.12.0 --- pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index 0f2a98c61f6..9805f6b2ccf 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation rec { - name = "gnome-icon-theme-2.91.93"; + name = "gnome-icon-theme-3.12.0"; src = fetchurl { - #url = "mirror://gnome/sources/gnome-icon-theme/3.4/${name}.tar.xz"; - url = "mirror://gnome/sources/gnome-icon-theme/2.91/${name}.tar.bz2"; - sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6"; + url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz"; + sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; From 6e337f2f9e6b5b1c2649896085989585dae78c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 22:12:12 -0300 Subject: [PATCH 2/8] gnome2.gnome_icon_theme: use pname and version --- pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index 9805f6b2ccf..a7217c40387 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.12.0"; + pname = "gnome-icon-theme"; + version = "3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; From 91bf69cb6b27fab4ee128a4b076857896009e15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 22:27:57 -0300 Subject: [PATCH 3/8] gnome2.gnome_icon_theme: add meta attributes --- .../desktops/gnome-2/desktop/gnome-icon-theme/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index a7217c40387..c858f99b980 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { # remove a tree of dirs with no files within postInstall = '' rm -r "$out/share/locale" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Collection of icons for the GNOME 2 desktop"; + homepage = "https://download.gnome.org/sources/gnome-icon-theme/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; }; } From d4042b9ccb474721af267b025ce0b8e07ef92a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 22:28:54 -0300 Subject: [PATCH 4/8] gnome2.gnome_icon_theme: change platform to unix --- pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index c858f99b980..4fbaa0e0968 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Collection of icons for the GNOME 2 desktop"; homepage = "https://download.gnome.org/sources/gnome-icon-theme/"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; } From 2e7067f984851475a2787d8c5eeaecfd318e5e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 22:30:26 -0300 Subject: [PATCH 5/8] gnome2.gnome_icon_theme: minor layout change --- .../gnome-2/desktop/gnome-icon-theme/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index 4fbaa0e0968..0ced95cb96b 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -9,10 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + iconnamingutils + gtk2 + ]; - # remove a tree of dirs with no files within - postInstall = '' rm -r "$out/share/locale" ''; + postInstall = '' + # remove a tree of dirs with no files within + rm -r "$out/share/locale" + ''; meta = with stdenv.lib; { description = "Collection of icons for the GNOME 2 desktop"; From a396bc1a9b2c628babf0536547b4c21d918a43c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 23:12:23 -0300 Subject: [PATCH 6/8] gnome2.gnome_icon_theme: do not drop icon theme cache --- pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index 0ced95cb96b..30dacbae740 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { gtk2 ]; + dontDropIconThemeCache = true; + postInstall = '' # remove a tree of dirs with no files within rm -r "$out/share/locale" From 4d9a57bd76842e9a53f417cccc8072ee7ded7533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 Apr 2020 23:15:14 -0300 Subject: [PATCH 7/8] treewide: rename gnome2.gnome_icon_theme package to use dashes --- .../modules/services/x11/desktop-managers/enlightenment.nix | 2 +- pkgs/desktops/gnome-2/default.nix | 5 +++-- pkgs/desktops/gnome-2/desktop/mail-notification/default.nix | 2 +- pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 4 ++-- pkgs/desktops/gnome-2/platform/gtkhtml/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 4 ++-- pkgs/tools/misc/alarm-clock-applet/default.nix | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 26b662a2a64..e9841edc9fa 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -38,7 +38,7 @@ in pkgs.gtk2 # To get GTK's themes. pkgs.tango-icon-theme - pkgs.gnome2.gnome_icon_theme + pkgs.gnome2.gnome-icon-theme pkgs.xorg.xcursorthemes ]; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index d0a7a890355..f1822385f0f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -60,7 +60,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtksourceview = callPackage ./desktop/gtksourceview { }; - gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; + gnome-icon-theme = callPackage ./desktop/gnome-icon-theme { }; vte = callPackage ./desktop/vte { }; @@ -87,6 +87,7 @@ lib.makeScope pkgs.newScope (self: with self; { startup_notification = pkgs.libstartup_notification; startupnotification = pkgs.libstartup_notification; gnomedocutils = pkgs.gnome-doc-utils; - gnomeicontheme = self.gnome_icon_theme; + gnomeicontheme = self.gnome-icon-theme; + gnome_icon_theme = self.gnome-icon-theme; gnome_common = gnome-common; }) diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index c12d50d792f..bce45c66b6f 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 33c2abef0fa..f4d6cb534bc 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool -, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: +, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; - propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ]; + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 3c89f9ff0fc..57a000351cf 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, intltool, -GConf, enchant, isocodes, gnome_icon_theme }: +GConf, enchant, isocodes, gnome-icon-theme }: stdenv.mkDerivation rec { name = "gtkhtml-3.32.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./01_remove-disable-deprecated.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ]; + buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; NIX_LDFLAGS = "-lgthread-2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index 215c9eb3e5e..bd74fe335eb 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome_icon_theme}: +{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: stdenv.mkDerivation { name = "libgnomeprintui-2.18.6"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme]; + buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme]; } diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 7b869d66d1c..ae9c88c0a6f 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome_icon_theme + gnome2.gnome-icon-theme libnotify libxml2 libunique From 737586bf4fcd93a3c20ad9056fe0630dd76f10cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 5 Apr 2020 22:01:34 -0300 Subject: [PATCH 8/8] gnome2.gnome-icon-theme: move to pkgs/data/icons --- .../modules/services/x11/desktop-managers/enlightenment.nix | 2 +- .../desktop => data/icons}/gnome-icon-theme/default.nix | 0 pkgs/desktops/gnome-2/default.nix | 5 ++--- pkgs/desktops/gnome-2/desktop/mail-notification/default.nix | 4 ++-- pkgs/tools/misc/alarm-clock-applet/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome-2/desktop => data/icons}/gnome-icon-theme/default.nix (100%) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index e9841edc9fa..32c9a40e535 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -38,7 +38,7 @@ in pkgs.gtk2 # To get GTK's themes. pkgs.tango-icon-theme - pkgs.gnome2.gnome-icon-theme + pkgs.gnome-icon-theme pkgs.xorg.xcursorthemes ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix similarity index 100% rename from pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix rename to pkgs/data/icons/gnome-icon-theme/default.nix diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index f1822385f0f..4212fa68bd4 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -60,8 +60,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtksourceview = callPackage ./desktop/gtksourceview { }; - gnome-icon-theme = callPackage ./desktop/gnome-icon-theme { }; - vte = callPackage ./desktop/vte { }; #### BINDINGS @@ -87,7 +85,8 @@ lib.makeScope pkgs.newScope (self: with self; { startup_notification = pkgs.libstartup_notification; startupnotification = pkgs.libstartup_notification; gnomedocutils = pkgs.gnome-doc-utils; - gnomeicontheme = self.gnome-icon-theme; + gnome-icon-theme = pkgs.gnome-icon-theme; gnome_icon_theme = self.gnome-icon-theme; + gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; }) diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index bce45c66b6f..5a81c1bcb1a 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index ae9c88c0a6f..c92c0821092 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -8,6 +8,7 @@ , gtk2 , gst_all_1 , gnome2 +, gnome-icon-theme , libnotify , libxml2 , libunique @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome-icon-theme + gnome-icon-theme libnotify libxml2 libunique diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bbbb74c2b7..d2e6ef032ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17812,6 +17812,8 @@ in gnome-breeze = callPackage ../data/themes/gnome-breeze { }; + gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { }; + go-font = callPackage ../data/fonts/go-font { }; greybird = callPackage ../data/themes/greybird { };