diff options
Diffstat (limited to 'pkgs/desktops')
156 files changed, 2185 insertions, 1204 deletions
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index bdddc28cc44..26520889c7d 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.5"; + version = "17.10.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3"; + sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 58fff802080..5dc9e9a7262 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.22.1"; + version = "0.22.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1q57fz57d0b26z06m1wiq7c1sniwh885b0vs02mk4jgwva46nyr0"; + sha256 = "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index a96d4f7a8ea..513948d3b51 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobjectIntrospection , itstool, libxml2, python3Packages, at-spi2-core , dbus, intltool, libwnck3 }: @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook itstool intltool + gobjectIntrospection # For setup hook + ]; buildInputs = [ gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 77ee086a950..9da265e75d6 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "cheese-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; + sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 82cf6447cc7..f41262d85b4 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.26.6"; + version = "3.28.0"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1adqh5f5aijkj5cnj1qprig8cd594m0qb0mzxn0zx44k0b6z5m1p"; + sha256 = "0b6yw664jdfc8ppd78akmrl36iximh7ipknf5mlzgga6lr6pl2nf"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit nss nspr libnotify procps highlight gnome3.libgweather gnome3.gsettings-desktop-schemas - gnome3.libgnome-keyring gnome3.glib-networking openldap + gnome3.glib-networking openldap ]; nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 89f20ed6f15..a9148fa52db 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,30 +1,39 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }: +{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +, file, json-glib, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { name = "file-roller-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; + sha256 = "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "file-roller"; attrPath = "gnome3.file-roller"; }; - }; + LANG = "en_US.UTF-8"; # postinstall.py + + nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook glibcLocales desktop-file-utils ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; - buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive - gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg - gnome3.dconf libnotify nautilus ]; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; - installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; + postPatch = '' + chmod +x postinstall.py # patchShebangs requires executable file + patchShebangs postinstall.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "file-roller"; + attrPath = "gnome3.file-roller"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/FileRoller; description = "Archive manager for the GNOME desktop environment"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index d8f272931d9..864535794f8 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.22.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; + sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 3a294df3ffe..577382a4986 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "glade-${version}"; - version = "3.20.4"; + version = "3.22.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1n9m4s81jd9fi60mrxsvlk4fi2vqrqmp95azsxp9jnqn6pkdz0jb"; + sha256 = "1j7kpy4jisz4nkd3yb5af4vd4bapyqchvp2gvq6ypfw3b0x88rkc"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 674aa84dbc2..52fa45812fa 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,51 +1,57 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib +{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret -, libcap_ng, numactl, xen, libapparmor +, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk }: # TODO: ovirt (optional) -stdenv.mkDerivation rec { +let + version = "3.27.92"; +in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; - version = "3.26.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; + sha256 = "1v1br4zh2w3w70np5imi31md6lnqamabiin521f806rdrxsnyggq"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-boxes"; attrPath = "gnome3.gnome-boxes"; }; - }; - - enableParallelBuilding = true; - doCheck = true; nativeBuildInputs = [ - makeWrapper pkgconfig gettext + meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils ]; buildInputs = [ - itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc - libvirt spice-gtk spice-protocol libsoup libosinfo systemd - tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret + libvirt-glib glib gtk3 gtkvnc libxml2 + libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd + tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive + gnome3.defaultIconTheme librsvg acl libgudev libsecret libcap_ng numactl xen libapparmor ]; preFixup = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" - done + gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}") ''; + mesonFlags = [ + "-Dovirt=false" + ]; + + postPatch = '' + chmod +x build-aux/post_install.py # patchShebangs requires executable file + patchShebangs build-aux/post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-boxes"; + attrPath = "gnome3.gnome-boxes"; + }; + }; + meta = with stdenv.lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; homepage = https://wiki.gnome.org/action/show/Apps/Boxes; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 4da7db42ab9..35888b21c2e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook +{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib , gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup , glib, gnome-online-accounts, gsettings-desktop-schemas }: -stdenv.mkDerivation rec { - name = "gnome-calendar-${version}"; - version = "3.26.3"; +let + pname = "gnome-calendar"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1clnfvvsaqw9vpxrs6qrxzmgpaw9x2nkjik2x2vwvm07pdvhddxn"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; }; + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; }; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; buildInputs = [ - gtk evolution-data-server libsoup glib gnome-online-accounts + gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib gsettings-desktop-schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 5b36ea83ee1..7ca25848374 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook +, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; + sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0"; }; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-characters"; attrPath = "gnome3.gnome-characters"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-characters"; + attrPath = "gnome3.gnome-characters"; + }; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; - buildInputs = [ - gtk3 gjs gdk_pixbuf gobjectIntrospection - librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ]; + + mesonFlags = [ + "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 47fd071bf83..09c00677199 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,33 +1,35 @@ { stdenv, fetchurl , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils -, vala, gtk3, glib, gsound +, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { name = "gnome-clocks-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; + sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-clocks"; attrPath = "gnome3.gnome-clocks"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; }; doCheck = true; nativeBuildInputs = [ - vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils + vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2 + gobjectIntrospection # for finding vapi files ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound ]; - prePatch = "patchShebangs build-aux/"; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Clocks; description = "Clock application designed for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 8e90c0c516a..3bd3222dc0c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,43 +1,52 @@ -{ stdenv, gettext, fetchurl, evince, gjs +{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs , pkgconfig, gtk3, glib, tracker, tracker-miners -, itstool, libxslt, webkitgtk +, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts +, gnome-desktop, libzapojit, libgepub , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl , gobjectIntrospection, json-glib, inkscape, poppler_utils , gmp, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0q7bp0mvmhqmsvm5sjavm46y7sz43na62d1hrl62vg19hdqr9ir4"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-documents"; attrPath = "gnome3.gnome-documents"; }; + sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha"; }; doCheck = true; - configureFlags = [ "--enable-getting-started" ]; - - nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ]; - buildInputs = [ gtk3 glib inkscape poppler_utils - gnome3.gsettings-desktop-schemas gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts - gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ]; - - enableParallelBuilding = true; + mesonFlags = [ "-Dgetting-started=true" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook + inkscape poppler_utils # building getting started + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme evince + libsoup webkitgtk gjs gobjectIntrospection + tracker tracker-miners libgdata + gnome-desktop libzapojit libgepub + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; preFixup = '' substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" - - gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-documents"; + attrPath = "gnome3.gnome-documents"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Documents; description = "Document manager application designed to work with GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 8531fc1c7c0..3fc444dbdd4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-getting-started-docs-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; + sha256 = "09khgzrbvcqvgjkqh8rp609bx818v5c8gzq61nxy5582s8habg8g"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 9f6c3153afb..c184bcbb42d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd }: +, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }: stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.26.3"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0cbzl38haz1m6y7gcbvvab0jcrva781izhp8xv2dzmma4xlzdw0k"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-logs"; attrPath = "gnome3.gnome-logs"; }; + sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b"; }; configureFlags = [ "--disable-tests" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme - ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-logs"; + attrPath = "gnome3.gnome-logs"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Logs; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index c03397a40d8..1c9d243c0c5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -1,31 +1,31 @@ { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 , gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup -, webkitgtk }: +, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }: -stdenv.mkDerivation rec { - name = "gnome-maps-${version}"; - version = "3.26.2"; +let + pname = "gnome-maps"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-maps"; attrPath = "gnome3.gnome-maps"; }; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1imcgw67cw1qkfz8m2my0f4qmss11fbqqqi4w7afcfq9p0rplgy0"; }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gobjectIntrospection wrapGAppsHook - gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode-glib libchamplain file libsoup - gdk_pixbuf librsvg libgweather autoreconfHook - gnome3.gsettings-desktop-schemas gnome3.evolution-data-server - gnome3.gnome-online-accounts gnome3.defaultIconTheme - webkitgtk ]; + nativeBuildInputs = [ intltool wrapGAppsHook file autoreconfHook pkgconfig ]; + buildInputs = [ + gobjectIntrospection + gtk3 geoclue2 gjs libgee folks gfbgraph + geocode-glib libchamplain libsoup + gdk_pixbuf librsvg libgweather + gnome3.gsettings-desktop-schemas evolution-data-server + gnome-online-accounts gnome3.defaultIconTheme + webkitgtk + ]; # The .service file isn't wrapped with the correct environment # so misses GIR files when started. By re-pointing from the gjs @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-maps" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Maps; description = "A map application for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 4053d287cc8..47ea6768a04 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,35 +1,46 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners -, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: +{ stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker +, libxml2, python3, libnotify, wrapGAppsHook, libmediaart +, gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins +, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib +, itstool, gnome3, gst_all_1 }: -stdenv.mkDerivation rec { - name = "gnome-music-${version}"; - version = "3.26.2"; +python3.pkgs.buildPythonApplication rec { + pname = "gnome-music"; + version = "3.28.0.1"; + + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0mam7d0lzl7ljd9lym9gkvqwvddic122sdmcgpjir58pmmg9bx8b"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; + sha256 = "0yyysmxwmk167n8wghcbmxz73kgl1y1j9js3mgkjjqsmkd9brk65"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-music"; attrPath = "gnome3.gnome-music"; }; - }; + nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; + buildInputs = with gst_all_1; [ + gtk3 glib libmediaart gnome-online-accounts + gdk_pixbuf gnome3.defaultIconTheme python3 + grilo grilo-plugins libnotify + gnome3.gsettings-desktop-schemas tracker + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + ]; + propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python - gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify - python3Packages.pycairo python3Packages.dbus-python python3Packages.requests - python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ]; + postPatch = '' + for f in meson_post_conf.py meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; - wrapPrefixVariables = [ "PYTHONPATH" ]; + doCheck = false; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Music; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 2837e1d093f..2163e6e875e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -1,43 +1,48 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 +{ stdenv, gettext, fetchurl, libxml2, libgdata , pkgconfig, gtk3, glib, tracker, tracker-miners -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop-file-utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib +, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins +, grilo, gnome-online-accounts +, desktop-file-utils, wrapGAppsHook +, gnome3, gdk_pixbuf, gexiv2, geocode-glib , dleyna-renderer }: -stdenv.mkDerivation rec { - name = "gnome-photos-${version}"; - version = "3.26.3"; +let + pname = "gnome-photos"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-photos"; attrPath = "gnome3.gnome-photos"; }; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11"; }; # doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gegl babl libgdata libdazzle + gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme + gfbgraph grilo-plugins grilo + gnome-online-accounts tracker + gexiv2 geocode-glib dleyna-renderer + tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome-online-accounts gnome3.gnome-desktop - lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils - wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ]; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; + description = "Access, organize and share your photos"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index a295ef456df..70ed4403f10 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -1,5 +1,5 @@ { stdenv -, intltool +, gettext , fetchurl , pkgconfig , gtk3 @@ -11,27 +11,30 @@ , wrapGAppsHook , gnome3 }: -stdenv.mkDerivation rec { - name = "gnome-power-manager-${version}"; +let + pname = "gnome-power-manager"; version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-power-manager/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-power-manager"; attrPath = "gnome3.gnome-power-manager"; }; + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook - intltool + gettext # needed by meson_post_install.sh glib.dev @@ -45,10 +48,8 @@ stdenv.mkDerivation rec { gnome3.defaultIconTheme ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gnome-power-manager/; + homepage = https://projects-old.gnome.org/gnome-power-manager/; description = "View battery and power statistics provided by UPower"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 9e43a3c52b4..ad759bf5506 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool, geoclue2 }: +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobjectIntrospection +, libgweather, intltool, itstool, geoclue2, gnome-desktop }: stdenv.mkDerivation rec { name = "gnome-weather-${version}"; @@ -10,13 +10,9 @@ stdenv.mkDerivation rec { sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-weather"; attrPath = "gnome3.gnome-weather"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 wrapGAppsHook gjs intltool itstool + gtk3 gjs gobjectIntrospection gnome-desktop libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas ]; @@ -30,6 +26,13 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-weather" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-weather"; + attrPath = "gnome3.gnome-weather"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Weather; description = "Access current weather conditions and forecasts"; diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix index 2812e7673b4..7ac8b4dfe11 100644 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix @@ -1,18 +1,27 @@ { stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }: -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - +let + pname = "nautilus-sendto"; version = "3.8.6"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz"; sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d"; }; nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ]; buildInputs = [ glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index f1d6dba21b0..4ae67f9b41d 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -3,34 +3,35 @@ , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell }: -stdenv.mkDerivation rec { - name = "polari-${version}"; - version = "3.26.2"; +let + pname = "polari"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "polari"; attrPath = "gnome3.polari"; }; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "08zgdqrnxl752nv0gac1k7wvjd4j7h5n4c0flrq7q337p40k3dd5"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; - nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 - desktop-file-utils gobjectIntrospection appstream-glib ]; - buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas - telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; + nativeBuildInputs = [ + meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 + desktop-file-utils gobjectIntrospection appstream-glib + ]; - patches = [ - (fetchpatch { - url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff; - sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9"; - }) + buildInputs = [ + gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Polari; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 2178004a43a..049b586f16d 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; + sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 1ff67e35f0f..693e284e270 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,34 +1,34 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: +{ stdenv, gettext, fetchurl, vala, desktop-file-utils +, meson, ninja, pkgconfig, gtk3, glib, libxml2 +, wrapGAppsHook, itstool, gnome3 }: -stdenv.mkDerivation rec { - name = "baobab-${version}"; - version = "3.26.1"; +let + pname = "baobab"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "baobab"; }; - }; + nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ gtk3 glib gnome3.defaultIconTheme ]; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2 - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = gnome3.maintainers; + description = "Graphical application to analyse disk usage in any GNOME environment"; + homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 47ddf6b6486..57c102d89cc 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3 +, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }: -stdenv.mkDerivation rec { - name = "dconf-editor-${version}"; - version = "3.26.2"; +let + pname = "dconf-editor"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; }; - }; + nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection ]; + + buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; - buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme - intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index a1722876121..9b1adeb953d 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 +, libxml2, docbook_xsl, makeWrapper }: let pname = "dconf"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "0.26.1"; + version = "0.28.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym"; + sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1"; }; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; + nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ]; buildInputs = [ glib dbus-glib ]; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace client/Makefile \ - --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index bf83c7aa8a1..4da4c480266 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "empathy-${version}"; - version = "3.12.14"; + version = "3.25.90"; src = fetchurl { url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; + sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 1acd6eb6942..50248586261 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,30 +1,42 @@ -{ fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 +{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3 +, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi , shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: -stdenv.mkDerivation rec { - name = "eog-${version}"; - version = "3.26.2"; +let + pname = "eog"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0d8fi5ydsh8n7d85dps8svl1bhid1p8jbnlwiqywj2gd2wpxpyjv"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; }; - }; + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ + libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi + gsettings-desktop-schemas shared-mime-info adwaita-icon-theme + ]; - buildInputs = with gnome3; - [ libxml2 libjpeg gtk glib libpeas librsvg - gsettings-desktop-schemas shared-mime-info adwaita-icon-theme - gnome-desktop libexif dconf ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; description = "GNOME image viewer"; + homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index a275040e1f4..3bc32f99f3e 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.26.6"; + version = "3.28.0.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1a1hyv326w4in4pl26gi2n3p9b38ih6zjdiigpqy0aiibnjnmc81"; + sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i"; }; passthru = { @@ -38,13 +38,6 @@ stdenv.mkDerivation rec { patchShebangs post_install.py ''; - postFixup = '' - # Patched meson does not add internal libraries to rpath - for f in $out/bin/.*-wrapped $out/libexec/.*-wrapped $out/libexec/epiphany/.*-wrapped $out/lib/epiphany/*.so $out/lib/epiphany/web-extensions/*.so; do - patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $f)" "$f" - done - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index f2459d7885c..c60087cf47b 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas + gnome3.gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index ae97fbc0e4d..350c29fa907 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,24 +1,22 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf +{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true +, p11-kit, db, nspr, nss, libical, gperf, makeWrapper , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.26.6"; + version = "3.28.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "evolution-data-server"; }; + sha256 = "1ybyyy6nls11az8lbri1y9527snz5h7qbhyfqvk0vc6vzvald5gv"; }; nativeBuildInputs = [ - cmake ninja pkgconfig intltool python3 gperf makeWrapper - ] ++ stdenv.lib.optional valaSupport vala; + cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala + ]; buildInputs = with gnome3; [ glib libsoup libxml2 gtk gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib @@ -27,16 +25,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libsecret nss nspr libical db ]; - # uoa irrelevant for now cmakeFlags = [ "-DENABLE_UOA=OFF" - ] ++ stdenv.lib.optionals valaSupport [ "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; - enableParallelBuilding = true; preFixup = '' for f in $(find $out/libexec/ -type f -executable); do @@ -46,7 +42,15 @@ stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "evolution-data-server"; + }; + }; + meta = with stdenv.lib; { + description = "Unified backend for programs that work with contacts, tasks, and calendar information"; + homepage = https://wiki.gnome.org/Apps/Evolution; license = licenses.lgpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index aa26c660768..61c17a210b4 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gcr-${version}"; - version = "3.20.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; + sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index ef9439a3029..999c3f05748 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.26.2.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; + sha256 = "0i5rzr6fdvlm88gl85gvql1wf1yflkmg90x81dqjf39as3ixs81s"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index e97e557e87a..910ef01fcb9 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -1,24 +1,38 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobjectIntrospection, gnome3, libsoup, json-glib }: stdenv.mkDerivation rec { name = "geocode-glib-${version}"; - version = "3.24.0"; + version = "3.25.4.1"; + + outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; + sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi"; }; + nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ]; + buildInputs = with gnome3; [ glib libsoup json-glib ]; + + patches = [ + ./installed-tests-path.patch + ]; + + postPatch = '' + substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests" + ''; + passthru = { - updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; }; + updateScript = gnome3.updateScript { + packageName = "geocode-glib"; + attrPath = "gnome3.geocode-glib"; + }; }; - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json-glib ]; - meta = with stdenv.lib; { - platforms = platforms.linux; + description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; + license = licenses.lgpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch new file mode 100644 index 00000000000..499c6800808 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch @@ -0,0 +1,8 @@ +--- a/geocode-glib/tests/meson.build ++++ b/geocode-glib/tests/meson.build +@@ -1,4 +1,4 @@ +-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib' ++install_dir = '@installedTests@/libexec/installed-tests/geocode-glib' + + e = executable('geo-uri', + 'geo-uri.c', diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 6e9f6c464df..888eb073a46 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.50.4"; + version = "1.52.0"; src = fetchurl { url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; + sha256 = "1jm40imin4sxzfcxcbmf4v71apk8y9icccq1a4m4mlz1wm2s092m"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 0aea3c4eac4..c52fe5c6049 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: stdenv.mkDerivation rec { name = "gnome-backgrounds-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; + sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 11816f68ff4..d570a541409 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-bluetooth-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; + sha256 = "0q7yzklrlayj99risj096mr5x35anx94wvr6nbf6pwbvvzv7453p"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 8376bea1a03..f30243003cb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,33 +1,43 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }: +{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 +, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection +, gnome3, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; + sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; }; - }; + nativeBuildInputs = [ + meson ninja pkgconfig vala gettext itstool wrapGAppsHook + gobjectIntrospection # for finding vapi files + ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + buildInputs = [ + gtk3 glib libxml2 gtksourceview3 mpfr gmp + gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas libsoup libmpc + ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; + doCheck = true; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; - buildInputs = [ bash gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview mpfr gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-calculator"; + attrPath = "gnome3.gnome-calculator"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; + homepage = https://wiki.gnome.org/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index b5052281b2f..9fcbbe814dc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -2,26 +2,18 @@ let pname = "gnome-color-manager"; - version = "3.26.0"; + version = "3.28.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1kbi46vk0qf0gxiwm4yhsx8931r7c9cg0c4244j8ncr0hph008b5"; + sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ]; buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ]; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=791158 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=364865; - sha256 = "1zh1aql6rwzfhy2xbdw0jqgzrl9l6wf0jcbdkjd67ykbmynh2cmv"; - }) - ]; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 6c485bcbd3f..9c9b26360aa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.26.1"; + version = "3.28.0"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jszv4b8rc5q8r460wb7qppvm1ssj4733b4z2vyavc95g00ik286"; + sha256 = "1qqj6k5rvmvg6v6vg4cak98w6rqknpqfsm0vfrwva6l6wbql2v8i"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; @@ -32,6 +32,12 @@ in stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0: + # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory + # #include <clutter-gtk/clutter-gtk.h> + # ^~~~~~~~~~~~~~~~~~~~~~~~~~~ + NIX_CFLAGS_COMPILE = "-I${clutter-gtk}/include/clutter-gtk-1.0"; + doCheck = true; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index b49b13aae80..8966893bde7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,24 +1,25 @@ -{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk +, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese , fontconfig, sound-theme-freedesktop, grilo }: let - version = "3.26.2"; + pname = "gnome-control-center"; + version = "3.28.0"; in stdenv.mkDerivation rec { - name = "gnome-control-center-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0nyx5nl2rky0249rdcy0hsccnxf3angpya0q859rrbrwaixqnxh3"; }; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns + meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl shared-mime-info ]; @@ -28,7 +29,7 @@ in stdenv.mkDerivation rec { gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify grilo libpwquality cracklib vino libcanberra-gtk3 libgudev - gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk + gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker ]; @@ -40,6 +41,11 @@ in stdenv.mkDerivation rec { }) ]; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" @@ -48,14 +54,14 @@ in stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${librsvg}/share" ) for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" + substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" done ''; passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-control-center"; - attrPath = "gnome3.gnome-control-center"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 7e85e27d6be..dad8d8177de 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; + sha256 = "17fm5z3kfm1m3420kjpvk1y0pc34p42rqfpmb1npy51jkv1p3pzi"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 0937f5c3082..4dde871ec70 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; + sha256 = "0ad98mxyygyzq0y280m6z73anyv3xxr6irpkp6vc803lhdr5b7fc"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 3774ff32db0..7e76b8991fd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-font-viewer-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; + sha256 = "16mp22f255b8zqnnlqh25n6v79b9bd0gmli9ywqyapa0cfai09x3"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index f7f06e35d3a..20ff00ff218 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook +, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; - version = "3.20.1"; + version = "3.28.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; + sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i"; }; passthru = { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 libgnome-keyring + dbus libgcrypt pam gtk3 libgnome-keyring openssh pango gcr gdk_pixbuf atk p11-kit ]; @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { patchShebangs build ''; - # Tests are not deterministic https://bugzilla.gnome.org/show_bug.cgi?id=791932 - doCheck = false; + doCheck = true; checkPhase = '' export HOME=$(mktemp -d) dbus-run-session \ diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 2abe8b28c03..d3d14f555cf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,24 +1,20 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc -, telepathy-glib, intltool, dbus_libs, icu, glib-networking -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc +, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: -stdenv.mkDerivation rec { - name = "gnome-online-accounts-${version}"; - version = "3.26.2"; +let + pname = "gnome-online-accounts"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; }; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - outputs = [ "out" "man" "dev" "devdoc" ]; configureFlags = [ @@ -32,14 +28,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig vala gnome-common intltool wrapGAppsHook - libxslt docbook_xsl_ns docbook_xsl gtk-doc + pkgconfig vala gettext wrapGAppsHook + libxslt docbook_xsl docbook_xsl_ns gtk-doc ]; buildInputs = [ glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup gcr kerberos ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index c8bc6146221..d36e7ce7432 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,27 +1,33 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412 +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { name = "gnome-session-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; + sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; }; - }; + mesonFlags = [ "-Dsystemd=true" ]; - configureFlags = "--enable-systemd"; + nativeBuildInputs = [ + meson ninja pkgconfig gettext makeWrapper + xmlto libxslt docbook_xsl docbook_xml_dtd_412 + dbus # for DTD + ]; - buildInputs = with gnome3; - [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt - gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme - gsettings-desktop-schemas upower intltool gconf makeWrapper systemd - epoxy - ]; + buildInputs = [ + glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; # FIXME: glib binaries shouldn't be in .dev! preFixup = '' @@ -34,13 +40,22 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \ + --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-session"; + attrPath = "gnome3.gnome-session"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "GNOME session manager"; + homepage = https://wiki.gnome.org/Projects/SessionManagement; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index e3c84dfa9fd..99b66fc1fe7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,38 +1,57 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager -, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }: +{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager +, docbook_xsl, wrapGAppsHook, ibus, xkeyboard_config, tzdata, nss }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; + sha256 = "1p3ccf4a4qbz73hqyx9i55hkp6l7c7la5kazqawcndl7bksywgny"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-settings-daemon"; attrPath = "gnome3.gnome-settings-daemon"; }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager - libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra-gtk3 upower colord libgweather xkeyboard_config - polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ]; + nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook ]; + + buildInputs = with gnome3; [ + ibus gtk glib gsettings-desktop-schemas networkmanager + libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib + libcanberra-gtk3 upower colord libgweather xkeyboard_config nss + polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + ]; postPatch = '' - substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + chmod +x $f + patchShebangs $f + done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-settings-daemon"; + attrPath = "gnome3.gnome-settings-daemon"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch new file mode 100644 index 00000000000..2229302cab7 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include <glib.h> + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index a76dd35711a..0d856e494c3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,26 +1,27 @@ -{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, gnome3, file }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib, gnome3 }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; + sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-shell-extensions"; + attrPath = "gnome3.gnome-shell-extensions"; + }; }; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib libgtop intltool itstool - makeWrapper file ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; + buildInputs = [ spidermonkey_52 ]; - configureFlags = [ "--enable-extensions=all" ]; + mesonFlags = [ "-Dextension_set=all" ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 026f5436237..70177d0a516 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core -, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales -, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info +, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet -, gst_all_1 }: +, sassc, systemd, gst_all_1 }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; + sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7"; }; # Needed to find /etc/NetworkManager/VPN @@ -25,21 +25,26 @@ in stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; - nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; - buildInputs = with gnome3; - [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice - libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf - (librsvg.override { enableIntrospection = true; }) - clutter networkmanager libstartup_notification telepathy-glib - libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server - libical nss gtk gstreamer gdm - libcanberra-gtk3 gnome-control-center geoclue2 - defaultIconTheme sqlite gnome3.gnome-bluetooth - libgweather # not declared at build time, but typelib is needed at runtime - gnome3.gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon - gst_all_1.gst-plugins-good # recording - gobjectIntrospection (stdenv.lib.getLib dconf) ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales + sassc + ]; + buildInputs = with gnome3; [ + systemd caribou + gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice + libcroco libsecret libsoup polkit gdk_pixbuf librsvg + clutter networkmanager libstartup_notification telepathy-glib + libXtst gjs mutter libpulseaudio evolution-data-server + libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 + defaultIconTheme gnome3.gnome-bluetooth + gnome3.gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + gst_all_1.gst-plugins-good # recording + gobjectIntrospection + + # not declared at build time, but typelib is needed at runtime + libgweather networkmanagerapplet + ]; propagatedUserEnvPkgs = [ # Needed to support on-screen keyboard used with touch screen devices # see https://github.com/NixOS/nixpkgs/issues/25968 @@ -52,7 +57,10 @@ in stdenv.mkDerivation rec { url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; }) - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit unzip; + }) ]; postPatch = '' @@ -60,28 +68,34 @@ in stdenv.mkDerivation rec { substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip" ''; postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; - postFixup = '' - # Patched meson does not add internal libraries to rpath - patchelf --set-rpath "$out/lib/gnome-shell:$(patchelf --print-rpath $out/bin/.gnome-shell-wrapped)" $out/bin/.gnome-shell-wrapped + preFixup = '' + gappsWrapperArgs+=( + # Until glib’s xdgmime is patched + # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) ''; - enableParallelBuilding = true; - passthru = { mozillaPlugin = "/lib/mozilla/plugins"; - updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-shell"; + attrPath = "gnome3.gnome-shell"; + }; }; meta = with stdenv.lib; { - platforms = platforms.linux; + description = "Core user interface for the GNOME 3 desktop"; + homepage = https://wiki.gnome.org/Projects/GnomeShell; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch index b24049f9b9f..7b7ff85a7c8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -1,18 +1,11 @@ -diff --git a/meson.build b/meson.build -index 4c1f5c63b..a9edb8795 100644 ---- a/meson.build -+++ b/meson.build -@@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services') - - plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir) - --keybindings_dep = dependency('gnome-keybindings', required: false) --if keybindings_dep.found() -- keysdir = keybindings_dep.get_pkgconfig_variable('keysdir') --else -- keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') --endif -+keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') - - atk_bridge_dep = dependency('atk-bridge-2.0') - canberra_dep = dependency('libcanberra') +--- a/js/ui/extensionDownloader.js ++++ b/js/ui/extensionDownloader.js +@@ -86,7 +86,7 @@ + stream.output_stream.write_bytes(contents, null); + stream.close(null); + let [success, pid] = GLib.spawn_async(null, +- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + null, + GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, + null); diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 8996a4cc3e9..2c4663b54ec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree -, glib, appstream-glib, libsoup, polkit, isocodes, gtkspell3, libxslt +, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.26.7"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00lfzvlicqd8gk5ijnjdi36ikmhdzvfjj993rpf7mm04ncw4k0za"; + sha256 = "0zwbgxzl805c4l8kwy5bn3p91s2qxlcn4syzzg4vd4kilc6nnjwk"; }; patches = [ @@ -20,19 +20,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 - valgrind-light docbook_xsl gtk-doc desktop-file-utils + valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection ]; buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup gnome3.gsettings-desktop-schemas gnome3.gnome-desktop - gtkspell3 json-glib libsecret ostree + gspell json-glib libsecret ostree polkit ]; - # https://gitlab.gnome.org/GNOME/gnome-software/issues/320 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - mesonFlags = [ "-Denable-flatpak=false" "-Denable-rpm=false" diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch index 239e1781bb1..6f443a8a43e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch @@ -5,7 +5,7 @@ /* find filename */ - filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL); -+ filename = g_build_filename ("@isoCodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); ++ filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { g_free (filename); filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL); diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 0e64bc4362c..5f707152aed 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,43 +1,41 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 +{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit , bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-system-monitor"; attrPath = "gnome3.gnome-system-monitor"; }; + sha256 = "1wvgx5p0a29d8yzp7rinpln90pg8vsjagqlvm4cxyhnl5hsdvrvn"; }; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop wrapGAppsHook - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings-desktop-schemas systemd ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" - ) - ''; + nativeBuildInputs = [ + pkgconfig gettext itstool wrapGAppsHook + polkit # for ITS file + ]; + buildInputs = [ + bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gsettings-desktop-schemas systemd + ]; # fails to build without --enable-static configureFlags = ["--enable-systemd" "--enable-static"]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-system-monitor"; + attrPath = "gnome3.gnome-system-monitor"; + }; + }; + meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; + homepage = https://wiki.gnome.org/Apps/SystemMonitor; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 703bb6fe110..9e99e84cfd5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; + sha256 = "1i5wlcjb0aigm1lbmn16nmh9rkjqfdpzzgf6qw7mcrhgw7pdald5"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix new file mode 100644 index 00000000000..dd11da3b11e --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +, gdk_pixbuf }: + +let + pname = "gnome-themes-extra"; + version = "3.27.92"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix deleted file mode 100644 index 720120b392d..00000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-${version}"; - version = "3.22.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf - gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 8854e7a2d0c..d4ba838bef3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.26.2.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; + sha256 = "0sx46j61kjn8kaf75303vym5sigki239pqzf5q4n72k1hwp7albp"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 642ee0badf1..36748566880 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-user-share-${version}"; - version = "3.18.3"; + version = "3.27.90"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; + sha256 = "1wd183cjr1gmzpsq7bqwkwhmcdng0m105f6ymc89r17fz85f4jhy"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 89614a327a6..e5ca314c69a 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gsettings-desktop-schemas-${version}"; - version = "3.24.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; + sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix deleted file mode 100644 index a870b16f925..00000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: - -let - checkInputs = [ xvfb_run dbus ]; -in stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; - version = "3.24.6"; - - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; }; - }; - - propagatedBuildInputs = [ - # Required by gtksourceview-3.0.pc - gtk3 - # Used by gtk_source_language_manager_guess_language - shared-mime-info - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ] - ++ stdenv.lib.optionals doCheck checkInputs; - - buildInputs = [ atk cairo glib pango libxml2 ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - enableParallelBuilding = true; - - doCheck = stdenv.isLinux; - checkPhase = '' - export NO_AT_BRIDGE=1 - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GtkSourceView; - platforms = with platforms; linux ++ darwin; - license = licenses.lgpl21; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c2..00000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 -+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 -@@ -68,6 +68,8 @@ - basename, - NULL)); - -+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); -+ - g_ptr_array_add (dirs, NULL); - - return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix index ae4f75bf76a..0a37144d8f7 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtksourceviewmm-${version}"; - version = "3.21.2"; + version = "3.21.3"; src = fetchurl { url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; + sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index ff9b232cb7a..45a4a97205b 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,18 +1,15 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme , glib, desktop-file-utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - stdenv.mkDerivation rec { name = "gucharmap-${version}"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; + sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv"; }; passthru = { @@ -21,8 +18,6 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; nativeBuildInputs = [ @@ -30,7 +25,7 @@ stdenv.mkDerivation rec { gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index a5ce9ee5e10..a65d0f401f0 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -6,6 +6,8 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; @@ -13,11 +15,12 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f45164..00000000000 --- a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix index cb771fc1989..f43b1de46e5 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix @@ -3,13 +3,13 @@ let pname = "libgepub"; - version = "0.5.3"; + version = "0.6.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0gn14k1qnkfj0677i2wc42ig4m8biqib9apk23dnl92m3h1f2lmb"; + sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index ad14abb1000..7c513e9398a 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -1,30 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup +, gtk-doc, docbook_xsl, gobjectIntrospection, tzdata, geocode-glib, vala, gnome3 }: -stdenv.mkDerivation rec { - name = "libgweather-${version}"; - version = "3.26.1"; +let + pname = "libgweather"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; - }; + outputs = [ "out" "dev" "devdoc" ]; - passthru = { - updateScript = gnome3.updateScript { packageName = "libgweather"; attrPath = "gnome3.libgweather"; }; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr"; }; - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ]; - nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ]; + buildInputs = [ glib gtk libsoup libxml2 geocode-glib ]; - # Prevent building vapi into ${vala} derivation directory - prePatch = '' - substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" + postPatch = '' + chmod +x meson/meson_post_install.py + patchShebangs meson/meson_post_install.py ''; + mesonFlags = [ + "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" + "-Denable_vala=true" + "-Dgtk_doc=true" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "A library to access weather information from online services for numerous locations"; + homepage = https://wiki.gnome.org/Projects/LibGWeather; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index 11761bd3412..10c6185fa82 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobjectIntrospection }: let pname = "libzapojit"; version = "0.0.3"; @@ -6,13 +6,15 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib json-glib rest libsoup gtk gnome-online-accounts ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; + propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index dc89c8c674a..623d2b1251e 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mutter-${version}"; - version = "3.26.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; + sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq"; }; passthru = { @@ -29,15 +29,6 @@ stdenv.mkDerivation rec { "--with-xwayland-path=${xwayland}/bin/Xwayland" ]; - patches = [ - # Pipewire 0.1.8 compatibility - (fetchurl { - name = "mutter-pipewire-0.1.8-compat.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=367356; - sha256 = "10bx5zf11wwhhy686w11ggikk56pbxydpbk9fbd947ir385x92cz"; - }) - ]; - propagatedBuildInputs = [ # required for pkgconfig to detect mutter-clutter libXtst diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 8ed7bb2f01a..a52ec342675 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,31 +1,28 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook , gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif -, exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: +, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: -stdenv.mkDerivation rec { - name = "nautilus-${version}"; - version = "3.26.2"; +let + pname = "nautilus"; + version = "3.28.0.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "nautilus"; attrPath = "gnome3.nautilus"; }; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1i3li3nd434vncd6j6has73xihbzjx1ab0xyw8wif11mym15ixrh"; }; nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux - tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas ]; + buildInputs = [ + dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux + tracker tracker-miners gnome-desktop gexiv2 + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + ]; propagatedBuildInputs = [ gnome-autoar ]; - # fatal error: gio/gunixinputstream.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preFixup = '' gappsWrapperArgs+=( # Thumbnailers @@ -35,16 +32,23 @@ stdenv.mkDerivation rec { ) ''; -# hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - postPatch = '' patchShebangs build-aux/meson/postinstall.py ''; patches = [ ./extension_dir.patch ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { + description = "The file manager for GNOME"; + homepage = https://wiki.gnome.org/Apps/Files; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index a40a8fe8f81..3528a9a93d9 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.26.3"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0galkcc76j0p016fvwn16llh0kh4ykvjy4v7kc6qqnlp38g174n3"; + sha256 = "0ki95d0v9l0pb5jvk1v8k49vb7snp9j7bnxw3m8q63m00yl33qhz"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index ef6bc97b1c6..457cee3b3f2 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }: stdenv.mkDerivation rec { name = "totem-pl-parser-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = [ gmime libxml2 libsoup ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 56292330e01..b612db9ce38 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -9,25 +9,23 @@ , libsoup, json-glib, libseccomp , libiptcdata }: -stdenv.mkDerivation rec { - name = "tracker-miners-${version}"; +let + pname = "tracker-miners"; version = "2.0.4"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/tracker-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "tracker-miners"; attrPath = "gnome3.tracker-miners"; }; - }; - NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; enableParallelBuilding = true; nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; - # TODO: add libgrss, libenca + # TODO: add libgrss, libenca, libosinfo buildInputs = [ bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu @@ -46,6 +44,13 @@ stdenv.mkDerivation rec { }) ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 9ed93fbcca9..847e3bf204d 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,5 +1,14 @@ --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c +@@ -313,7 +313,7 @@ + goto end; + } + } else { +- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", ++ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", + DEFAULT_RULE, NULL); + + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { @@ -372,7 +372,7 @@ if (!priv->ontology_location) { gchar *ontology_path; diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 61ae06ec066..cbf16c6807f 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, intltool, pkgconfig +{ stdenv, fetchurl, intltool, pkgconfig, gobjectIntrospection , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: -stdenv.mkDerivation rec { - name = "tracker-${version}"; +let + pname = "tracker"; version = "2.0.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/tracker/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "tracker"; attrPath = "gnome3.tracker"; }; - }; - enableParallelBuilding = true; - nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ]; + nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection ]; # TODO: add libstemmer buildInputs = [ glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { patchShebangs utils/g-ir-merge/g-ir-merge ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 4365451636a..65c6ace8eec 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup , telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null -, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null -, zlib ? null, libjpeg ? null -, libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null -, networkmanager ? null }: +, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext +, networkmanager }: with lib; @@ -18,28 +15,25 @@ stdenv.mkDerivation rec { sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; }; - }; - doCheck = true; + nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; + buildInputs = [ - wrapGAppsHook - pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ] - ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ filter (p: p != null) [ - libsecret gnutls libgcrypt avahi zlib libjpeg - libXdamage libXfixes libXext networkmanager - ]; - - preFixup = '' - export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH" - ''; + gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup + libsecret gnutls libgcrypt avahi zlib libjpeg + libXdamage libXfixes libXext networkmanager + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "vino"; + attrPath = "gnome3.vino"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; + homepage = https://wiki.gnome.org/Projects/Vino; description = "GNOME desktop sharing server"; maintainers = with maintainers; [ lethalman domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 4abeb2ba961..73fd244c548 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vte-${version}"; - version = "0.50.2"; + version = "0.52.0"; src = fetchurl { url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; + sha256 = "0rq5gkg7bfrxlsm8mgdh4605hki81wljmjhhz8x4kbspvpfp5bnm"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 28e89cad9fb..5a0a5bd43b5 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.18.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; + sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 341a7d7582c..f904a90454f 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "yelp-xsl-${version}"; - version = "3.20.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; + sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 661ddc1f12f..60b91aaa04a 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; + sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index fd55fd9f87a..05637e200e3 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "zenity-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; + sha256 = "1y3dha9faqgy5l8wqh3qp354gzdh36fx70q2kc9k1nw7p498yn2y"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 047d07aaae2..c28695ed8e2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -29,7 +29,7 @@ let gtk3.out # for gtk-update-icon-cache glib-networking gvfs dconf gnome-backgrounds gnome-control-center gnome-menus gnome-settings-daemon gnome-shell - gnome-themes-standard defaultIconTheme gnome-shell-extensions + gnome-themes-extra defaultIconTheme gnome-shell-extensions pkgs.hicolor-icon-theme ]; @@ -38,11 +38,11 @@ let gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor simple-scan gnome-terminal gnome-user-docs evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos + gnome-clocks gnome-music gnome-tweaks gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-getting-started-docs gnome-packagekit gnome-software - gnome-power-manager + gnome-power-manager gnome-usage ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno @@ -53,9 +53,9 @@ let ]; inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf - easytag meld orca rhythmbox shotwell - clutter clutter-gst clutter-gtk cogl gtkvnc; + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 + easytag meld orca rhythmbox shotwell gnome-usage + clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -64,7 +64,7 @@ let gnome3 = self // { recurseForDerivations = false; }; gtk = gtk3; gtkmm = gtkmm3; - vala = pkgs.vala_0_38; + vala = pkgs.vala_0_40; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; # Simplify the nixos module and gnome packages @@ -160,7 +160,7 @@ let gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome-themes-standard = callPackage ./core/gnome-themes-standard { }; + gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; gnome-user-docs = callPackage ./core/gnome-user-docs { }; @@ -174,8 +174,6 @@ let gsound = callPackage ./core/gsound { }; - gtksourceview = callPackage ./core/gtksourceview { }; - gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; gucharmap = callPackage ./core/gucharmap { }; @@ -386,7 +384,7 @@ let gspell = callPackage ./misc/gspell { }; - libgames-support = callPackage ./misc/libgames-support { }; + libgnome-games-support = callPackage ./misc/libgnome-games-support { }; libgda = callPackage ./misc/libgda { }; @@ -396,7 +394,7 @@ let gexiv2 = callPackage ./misc/gexiv2 { }; - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; @@ -426,9 +424,12 @@ let gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 gnome_shell = gnome-shell; # added 2018-02-25 gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 + libgames-support = libgnome-games-support; # added 2018-03-14 libgnome_keyring = libgnome-keyring; # added 2018-02-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 419588f8684..0e50953b3de 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "anjuta-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; + sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 321e887cba6..786eece7194 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,30 +1,34 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, gsettings-desktop-schemas }: +, glib, appstream-glib, gobjectIntrospection +, webkitgtk, gettext, itstool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "devhelp-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e"; + sha256 = "1b4l71775p3mps1jsv7pz26v0lhd0qczsp6qr1dwv7hyslmpb5qn"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "devhelp"; attrPath = "gnome3.devhelp"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; buildInputs = [ - gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - gsettings-desktop-schemas + glib gtk3 webkitgtk + gnome3.defaultIconTheme gsettings-desktop-schemas ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "devhelp"; + attrPath = "gnome3.devhelp"; + }; + }; + meta = with stdenv.lib; { - homepage = https://live.gnome.org/devhelp; description = "API documentation browser for GNOME"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Devhelp; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix index 07fc15f0d55..75f9bc48db6 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gdl-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; + sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 3949e29089c..57070f7ce38 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-devel-docs-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; + sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix new file mode 100644 index 00000000000..dcc018d1883 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-timepp-${version}"; + version = "2018.03.17"; + + src = fetchFromGitHub { + owner = "zagortenay333"; + repo = "timepp__gnome"; + rev = "440cf85dc68d9e6ba876793f13910ee6239622cf"; + sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v"; + }; + + uuid = "timepp@zagortenay333"; + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; + homepage = https://github.com/zagortenay333/timepp__gnome; + license = licenses.gpl3; + maintainers = with maintainers; [ svsdep ]; + }; +} diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index b194ac42bf2..77220124fcc 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "aisleriot-${version}"; - version = "3.22.4"; + version = "3.22.5"; src = fetchurl { url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; + sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 8806344f3b3..4115fda9f8d 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "five-or-more-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; + sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 22032f16f47..bf21f734680 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }: +, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { name = "four-in-a-row-${version}"; - version = "3.22.2"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; + sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k"; }; + nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; + buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ]; + passthru = { - updateScript = gnome3.updateScript { packageName = "four-in-a-row"; attrPath = "gnome3.four-in-a-row"; }; + updateScript = gnome3.updateScript { + packageName = "four-in-a-row"; + attrPath = "gnome3.four-in-a-row"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg - libxml2 gnome3.defaultIconTheme - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Four-in-a-row; description = "Make lines of the same color to win"; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index f50542770c4..063b97801b4 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2 }: +{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection +, gettext, itstool, libxml2, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { name = "gnome-chess-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; + sha256 = "1vxgb36njv4v3bgdpwxd89rvr6s6pkbh9d3xislxqry2yp4f03w0"; }; + nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-chess"; attrPath = "gnome3.gnome-chess"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-chess"; + attrPath = "gnome3.gnome-chess"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Chess; description = "Play the classic two-player boardgame of chess"; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index c1f91092bb0..fc75cd081f9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool, libgee, libgames-support }: +{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }: -stdenv.mkDerivation rec { - name = "gnome-klotski-${version}"; - version = "3.22.2"; +let + pname = "gnome-klotski"; + version = "3.22.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-klotski/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f"; }; + nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ]; + passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-klotski"; attrPath = "gnome3.gnome-klotski"; }; + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support - gnome3.defaultIconTheme - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Klotski; description = "Slide blocks to solve the puzzle"; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index ce5dc8bc14c..55dad369c10 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, libgames-support, libgee }: +{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, gettext, itstool, libxml2, libgames-support, libgee }: stdenv.mkDerivation rec { name = "gnome-mines-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; + sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf"; }; + # gobjectIntrospection for finding vapi files + nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ]; + buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ]; + + postPatch = '' + chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file + patchShebangs data/meson_compile_gschema.py + ''; + passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-mines"; attrPath = "gnome3.gnome-mines"; }; + updateScript = gnome3.updateScript { + packageName = "gnome-mines"; + attrPath = "gnome3.gnome-mines"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme libgames-support libgee - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mines; description = "Clear hidden mines from a minefield"; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index aa5e00606c7..e07e3c14152 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-robots-${version}"; - version = "3.22.2"; + version = "3.22.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; + sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index b3380e6bb96..1d467e542da 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-sudoku-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; + sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 4f87fb50d61..855e496dfaf 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-taquin-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; + sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index d31457f868c..55dac4659d0 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "iagno-${version}"; - version = "3.26.1"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; + sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 1a163352cfc..73b7c092a66 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter-gtk, libxml2, dconf }: +{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib }: stdenv.mkDerivation rec { name = "lightsoff-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; + sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "lightsoff"; attrPath = "gnome3.lightsoff"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ]; + nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "lightsoff"; + attrPath = "gnome3.lightsoff"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Lightsoff; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 92da14fb559..13b6f57d0fd 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,24 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils +, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }: -stdenv.mkDerivation rec { - name = "swell-foop-${version}"; - version = "3.26.0"; +let + pname = "swell-foop"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "swell-foop"; attrPath = "gnome3.swell-foop"; }; + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ]; + nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Swell%20Foop; diff --git a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch deleted file mode 100644 index c229cc96094..00000000000 --- a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8a94642..1ca6426 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) - GLIB_REQUIRED=2.38.0 - GTK_REQUIRED=3.12.2 - GEE_REQUIRED=0.10.5 --ECAL_REQUIRED=3.8.5 -+ECAL_REQUIRED=3.13.90 - LIBSOUP_REQUIRED=2.44 - GDATA_REQUIRED=0.14.0 - GOA_REQUIRED=3.8.3 -diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala -index ee6a572..5009b5d 100644 ---- a/src/backing/eds/backing-eds-calendar-source.vala -+++ b/src/backing/eds/backing-eds-calendar-source.vala -@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { - - // Invoked by EdsStore prior to making it available outside of unit - internal async void open_async(Cancellable? cancellable) throws Error { -- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, -+ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, - cancellable); - - client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); -diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi -index 6ead3ec..46fd711 100644 ---- a/vapi/libecal-1.2.vapi -+++ b/vapi/libecal-1.2.vapi -@@ -23,7 +23,7 @@ namespace E { - public bool check_save_schedules (); - public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_connect_finish")] -- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; - public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_create_object_finish")] - public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index 73d3b555ba9..c81238d2498 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -1,34 +1,36 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper -, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection +, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "california-${majorVersion}.0"; + pname = "california"; + version = "0.4.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server - sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ]; - - preFixup = '' - wrapProgram "$out/bin/california" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share" - ''; + nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; enableParallelBuilding = true; - # Apply fedoras patch to build with evolution-data-server >3.13 - patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; + patches = [ + # Apply Fedora patch to build with evolution-data-server > 3.13 + (fetchurl { + url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch; + sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm"; + }) + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/California; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index f8c29625261..5a95802b81a 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils -, libnotify, libcanberra-gtk3, libsecret, gmime -, libpthreadstubs, sqlite +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant +, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils +, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes +, gobjectIntrospection, libpthreadstubs, sqlite , gnome3, librsvg, gnome-doc-utils, webkitgtk }: let @@ -17,10 +17,16 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ]; - buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr - gdk_pixbuf librsvg gnome3.defaultIconTheme ]; + nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; + buildInputs = [ + gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes + gdk_pixbuf librsvg gnome3.defaultIconTheme + ]; + + cmakeFlags = [ + "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" + ]; preConfigure = '' substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' @@ -31,8 +37,6 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 94a29546fb9..8194e3f1699 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json-glib }: +, gnome3, libsoup, json-glib, gobjectIntrospection }: let pname = "gfbgraph"; @@ -7,15 +7,19 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; buildInputs = [ glib gnome3.gnome-online-accounts ]; propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; + configureFlags = [ "--enable-introspection" ]; + enableParallelBuilding = true; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index ecc0711482f..e3ff784b16f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; + sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index 35c3a678e84..00000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, meson, ninja, gettext, fetchurl, atk -, pkgconfig, gtk3, glib, libsoup -, bash, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "gnome-tweak-tool-${version}"; - version = "3.26.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-tweak-tool"; attrPath = "gnome3.gnome-tweak-tool"; }; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook - ]; - buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome-shell python3Packages.pygobject3 - libsoup gnome3.gnome-settings-daemon gnome3.nautilus - gnome3.mutter gnome3.gnome-desktop gobjectIntrospection - ]; - - postPatch = '' - patchShebangs meson-postinstall.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") - ''; - - patches = [ - (fetchurl { - name = "find_gsettings.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=365642; - sha256 = "14ik1kad0w99xa2wn3d4ynrkhnwchjlqfbaij7p11y5zpiwhaha4"; - }) - (fetchurl { - name = "0001-Search-for-themes-and-icons-in-system-data-dirs.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=365643; - sha256 = "1phq3c7hc9lryih6rp3m5wmp88rfbl6iv42ng4g6bzm1jphgl89f"; - }) - (fetchurl { - name = "0001-appearance-Don-t-duplicate-the-cursor-theme-name.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=365648; - sha256 = "1n9vwsfz4sx72qsi1gd1y7460zmagwirvmi9qrfhc3ahanpyn4fr"; - }) - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix new file mode 100644 index 00000000000..75b5060d7b3 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -0,0 +1,52 @@ +{ stdenv, meson, ninja, gettext, fetchurl, atk +, pkgconfig, gtk3, glib, libsoup +, bash, itstool, libxml2, python3Packages +, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: + +let + pname = "gnome-tweaks"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0d8zxfa8r4n4l6jzyzy6q58padxjlrad3c71mwqidm2ww8nm6i19"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook + ]; + buildInputs = [ + gtk3 glib gnome3.gsettings-desktop-schemas + gdk_pixbuf gnome3.defaultIconTheme + libnotify gnome3.gnome-shell python3Packages.pygobject3 + libsoup gnome3.gnome-settings-daemon gnome3.nautilus + gnome3.mutter gnome3.gnome-desktop gobjectIntrospection + gnome3.nautilus + ]; + + postPatch = '' + patchShebangs meson-postinstall.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + description = "A tool to customize advanced GNOME 3 options"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index aaedd6ef632..b24b51a0c33 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.26.0"; + version = "3.28.0"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "0xlcbm9qnw61h6xwa1c0lz5mp1ca3vjjn5wpk0ahhhl6k94mzjs7"; + sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir"; }; nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 5d2dc08e7e3..ca1fc3724fc 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }: -stdenv.mkDerivation rec { - name = "gspell-${version}"; - version = "1.6.1"; +let + pname = "gspell"; + version = "1.8.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/gspell/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; - }; + outputs = [ "out" "dev" ]; + outputBin = "dev"; - passthru = { - updateScript = gnome3.updateScript { packageName = "gspell"; attrPath = "gnome3.gspell"; }; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv"; }; - propagatedBuildInputs = [ enchant ]; # required for pkgconfig + propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig - nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ]; buildInputs = [ glib gtk3 isocodes ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "A spell-checking library for GTK+ applications"; homepage = https://wiki.gnome.org/Projects/gspell; diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 29fdd317656..5712d612e9a 100644 --- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }: let pname = "libgnome-games-support"; - version = "1.2.3"; + version = "1.4.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1"; + sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty; buildInputs = [ glib gtk3 libgee ]; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.libgames-support"; + attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 02f58f81200..7920c8e1f45 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -8,13 +8,13 @@ , libXmu }: let - version = "0.25.0"; + version = "0.26.2"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; + sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo base gui freetype x11 libXmu ]; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 4d9f763acc4..40c79274aae 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -11,13 +11,13 @@ , pkgconfig, portaudio }: let - version = "1.24.9"; + version = "1.25.1"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; + sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index ef95f6035b2..dbed065190e 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - + buildInputs = [ gtk3 ]; configureFlags = [ "--enable-gtk3" ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = { description = "Lightweight and desktop independent task manager"; longDescription = '' @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure gtk+. ''; - homepage = https://wiki.lxde.org/en/LXTask; + homepage = https://wiki.lxde.org/en/LXTask; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index dfd3766df29..d82cd4b073a 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1yj8zr9w0a1h4bpd27w7ssg97vnrz7yr10jqhx67yyb900ccr3ik"; + sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index ba1cf9ed993..20fdddfe46c 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 8d959478a0d..14b5f3a39ad 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/bluedevil-5.12.2.tar.xz"; - sha256 = "11xwyawcfkxhdzcgj4nkj1vlp6zn53k9dl3c4llpj1z08jc2vdpj"; - name = "bluedevil-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz"; + sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk"; + name = "bluedevil-5.12.3.tar.xz"; }; }; breeze = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/breeze-5.12.2.tar.xz"; - sha256 = "1vx03wi4m6ly6sw7cznhzg96rkxbn2mxsn9719pra616axl6c00s"; - name = "breeze-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz"; + sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw"; + name = "breeze-5.12.3.tar.xz"; }; }; breeze-grub = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/breeze-grub-5.12.2.tar.xz"; - sha256 = "1a76xbnrbd18cd6p0n94fixc7jmd8vdnzqbi9pbi3wj82cpp95xq"; - name = "breeze-grub-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz"; + sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b"; + name = "breeze-grub-5.12.3.tar.xz"; }; }; breeze-gtk = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/breeze-gtk-5.12.2.tar.xz"; - sha256 = "1811r8gqhrdf5b4a1k94cid1whcd8g6h2mrms6qm40brzj8qn9w0"; - name = "breeze-gtk-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz"; + sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x"; + name = "breeze-gtk-5.12.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/breeze-plymouth-5.12.2.tar.xz"; - sha256 = "1n96iysljakhhkw9wavhbvj29zlkkajgwpxs6v5ny4iifv9gn3cv"; - name = "breeze-plymouth-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz"; + sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn"; + name = "breeze-plymouth-5.12.3.tar.xz"; }; }; discover = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/discover-5.12.2.tar.xz"; - sha256 = "1hkbannyrw1c6h45c8s669d4hg6irc991hjlg0mm31lnpa8lb51v"; - name = "discover-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz"; + sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd"; + name = "discover-5.12.3.tar.xz"; }; }; drkonqi = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/drkonqi-5.12.2.tar.xz"; - sha256 = "0dw9axkhp0cgw276cpfp4ddf5g9s2ccz6q43pk68fvphbz7m2wqm"; - name = "drkonqi-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz"; + sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m"; + name = "drkonqi-5.12.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kactivitymanagerd-5.12.2.tar.xz"; - sha256 = "1l6ar094y272fjxzj6qpapz4g5mfbf82z80zygmrs0cizpz1xv84"; - name = "kactivitymanagerd-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz"; + sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1"; + name = "kactivitymanagerd-5.12.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kde-cli-tools-5.12.2.tar.xz"; - sha256 = "1jd7r49i24psrx59n0djbbxbv8c3wchiabgrv4x4dq6nsqygh6vc"; - name = "kde-cli-tools-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kde-cli-tools-5.12.3.tar.xz"; + sha256 = "0d2mkrpy2pib0za75m2mg6pvkklbwizh14cqi3zabqi384fys1j3"; + name = "kde-cli-tools-5.12.3.tar.xz"; }; }; kdecoration = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kdecoration-5.12.2.tar.xz"; - sha256 = "1whngfld0nlw3mbf70khvqiqqskfglnn3dzx5zg0l14xv0kips79"; - name = "kdecoration-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz"; + sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy"; + name = "kdecoration-5.12.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kde-gtk-config-5.12.2.tar.xz"; - sha256 = "1ncyj665hra8bj4nk2idpjq0lm72dr3r467ddx6k0n63arvfmxm4"; - name = "kde-gtk-config-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kde-gtk-config-5.12.3.tar.xz"; + sha256 = "0wsxz5v585srkn8qbb4b82ci1wgrpzg87krixzsxzd3k0wc0c71q"; + name = "kde-gtk-config-5.12.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kdeplasma-addons-5.12.2.tar.xz"; - sha256 = "00x0jd8jw77fh5qy5z9xldw3m27il9mamq0fl8f4vmny7y8hqg2k"; - name = "kdeplasma-addons-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz"; + sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p"; + name = "kdeplasma-addons-5.12.3.tar.xz"; }; }; kgamma5 = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kgamma5-5.12.2.tar.xz"; - sha256 = "1xhn8dw0595f48qbvj304agkg34y2pr0czvkpl1ahhzsndgjkxjs"; - name = "kgamma5-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz"; + sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm"; + name = "kgamma5-5.12.3.tar.xz"; }; }; khotkeys = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/khotkeys-5.12.2.tar.xz"; - sha256 = "1hsnasx67vf0jdxnmlvhm86ykvjc89zbr8rdgr1ixq6iy543c1ry"; - name = "khotkeys-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz"; + sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa"; + name = "khotkeys-5.12.3.tar.xz"; }; }; kinfocenter = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kinfocenter-5.12.2.tar.xz"; - sha256 = "0sagy72x94nv1zxvllkzgmln2j04bh8cib4fx3zsqfn572wncjqi"; - name = "kinfocenter-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz"; + sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr"; + name = "kinfocenter-5.12.3.tar.xz"; }; }; kmenuedit = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kmenuedit-5.12.2.tar.xz"; - sha256 = "1ygwv1s9zgd6qh3gd7537dgjil8h3i21i5wwn99wynbifq0w6ikv"; - name = "kmenuedit-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz"; + sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4"; + name = "kmenuedit-5.12.3.tar.xz"; }; }; kscreen = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kscreen-5.12.2.tar.xz"; - sha256 = "1scmaydn4fypjizfm7l71vszx725vgbgsg7hpnv2dgwqrf98kl9v"; - name = "kscreen-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz"; + sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9"; + name = "kscreen-5.12.3.tar.xz"; }; }; kscreenlocker = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kscreenlocker-5.12.2.tar.xz"; - sha256 = "0v8qyjkmaxq711dw1iw12j38aswfr4qccvzkm3qc1gvfjs1vl0gn"; - name = "kscreenlocker-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz"; + sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm"; + name = "kscreenlocker-5.12.3.tar.xz"; }; }; ksshaskpass = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/ksshaskpass-5.12.2.tar.xz"; - sha256 = "1b70jbdm3c4agk66v5yvzvzdlwp0xn8lmxn3zyk1n280xgqr2z1m"; - name = "ksshaskpass-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz"; + sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h"; + name = "ksshaskpass-5.12.3.tar.xz"; }; }; ksysguard = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/ksysguard-5.12.2.tar.xz"; - sha256 = "0k8ziqbvm8igczij3a26jyc0i7hwiqfv0072kywz76m9pfsd3lp7"; - name = "ksysguard-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz"; + sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc"; + name = "ksysguard-5.12.3.tar.xz"; }; }; kwallet-pam = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kwallet-pam-5.12.2.tar.xz"; - sha256 = "0xg01iianf0ygpjf971i3fln0gn44gw83gxhplwjv3q5dn79plrd"; - name = "kwallet-pam-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz"; + sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz"; + name = "kwallet-pam-5.12.3.tar.xz"; }; }; kwayland-integration = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kwayland-integration-5.12.2.tar.xz"; - sha256 = "1s4vdsv8s72nplmk9395zfsp4fars14n2rkgqfp95b7ii76519nn"; - name = "kwayland-integration-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz"; + sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi"; + name = "kwayland-integration-5.12.3.tar.xz"; }; }; kwin = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kwin-5.12.2.tar.xz"; - sha256 = "0lnyikmjsxjjbz7mrf421y1lw0vjqsri66dsjv2wldlbgifp94kw"; - name = "kwin-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz"; + sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71"; + name = "kwin-5.12.3.tar.xz"; }; }; kwrited = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/kwrited-5.12.2.tar.xz"; - sha256 = "1n20g92h2hgcgp9qdxifp55acbkgh09chqz0p8qrj39vw5w5abv4"; - name = "kwrited-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz"; + sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1"; + name = "kwrited-5.12.3.tar.xz"; }; }; libkscreen = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/libkscreen-5.12.2.tar.xz"; - sha256 = "1hv180ac97m1i47c2bapv5bz149i8p55qyfxrka7fivhzszsa8x0"; - name = "libkscreen-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz"; + sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4"; + name = "libkscreen-5.12.3.tar.xz"; }; }; libksysguard = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/libksysguard-5.12.2.tar.xz"; - sha256 = "1nf847lwx88f8g0bknaxzn0q6cvs2xn1cz6ch7qrblg0a8v3ig19"; - name = "libksysguard-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz"; + sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l"; + name = "libksysguard-5.12.3.tar.xz"; }; }; milou = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/milou-5.12.2.tar.xz"; - sha256 = "1sick71qd04shs34nlsplln3zpgvrbal4jlklm4k094w487fvcc8"; - name = "milou-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz"; + sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq"; + name = "milou-5.12.3.tar.xz"; }; }; oxygen = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/oxygen-5.12.2.tar.xz"; - sha256 = "03g0pwk5n6idgrrm0g4hfvyls7h8by6lz6rp7h1i9ibpaph3czmy"; - name = "oxygen-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz"; + sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856"; + name = "oxygen-5.12.3.tar.xz"; }; }; plasma-desktop = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-desktop-5.12.2.tar.xz"; - sha256 = "0wymhk1wzvx3ihq7gn4zkisp5x1n5m62fk1vmg5il75hn69qw4g5"; - name = "plasma-desktop-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz"; + sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8"; + name = "plasma-desktop-5.12.3.tar.xz"; }; }; plasma-integration = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-integration-5.12.2.tar.xz"; - sha256 = "0hyxn51vjdbkw9kj5nqp7lr1myjpnlp5ri01jwg43v5h44mq6k08"; - name = "plasma-integration-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz"; + sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww"; + name = "plasma-integration-5.12.3.tar.xz"; }; }; plasma-nm = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-nm-5.12.2.tar.xz"; - sha256 = "0wlp0wqbcbnmclfvhii50sds1ij4la3wni9987xym7qrc8bxm43x"; - name = "plasma-nm-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz"; + sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w"; + name = "plasma-nm-5.12.3.tar.xz"; }; }; plasma-pa = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-pa-5.12.2.tar.xz"; - sha256 = "119gcgx8rrihhmxzfp7wj3v8q4vwzk989w9qn5b2y72vyvllbln7"; - name = "plasma-pa-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz"; + sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l"; + name = "plasma-pa-5.12.3.tar.xz"; }; }; plasma-sdk = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-sdk-5.12.2.tar.xz"; - sha256 = "0as3718rkcal8va6w1ip2prsvrp6b218r33hmhdkdbbshnx40csv"; - name = "plasma-sdk-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz"; + sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli"; + name = "plasma-sdk-5.12.3.tar.xz"; }; }; plasma-tests = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-tests-5.12.2.tar.xz"; - sha256 = "1336kj277hrbgi5dx6z19dp8fgxhifnapd0jas4lq8z06gn6dh40"; - name = "plasma-tests-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz"; + sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7"; + name = "plasma-tests-5.12.3.tar.xz"; }; }; plasma-vault = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-vault-5.12.2.tar.xz"; - sha256 = "1hkdaxlr00s00ax0xm2zmfk9pwl4nrs1x2dna248s6dd06cjmapk"; - name = "plasma-vault-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz"; + sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h"; + name = "plasma-vault-5.12.3.tar.xz"; }; }; plasma-workspace = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-workspace-5.12.2.tar.xz"; - sha256 = "1v4xaviby76c833gx02s1bf0hk9smv4m2s8sp75yxirh2xv4azid"; - name = "plasma-workspace-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz"; + sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy"; + name = "plasma-workspace-5.12.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plasma-workspace-wallpapers-5.12.2.tar.xz"; - sha256 = "1x6qi0cpr461vc7gn4fzz9dh9wfwz6hcgb8dsz82wdxpwssck7i7"; - name = "plasma-workspace-wallpapers-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-wallpapers-5.12.3.tar.xz"; + sha256 = "0gmpf0d7dzpnmm9lzgjqmr201mjkvjwbf0qlg5n87w7j9j4c580v"; + name = "plasma-workspace-wallpapers-5.12.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/plymouth-kcm-5.12.2.tar.xz"; - sha256 = "11kaprbcsd7j1kamsr9m9c27rj1ry8gxp1m6r1ibf9agimsmdfcb"; - name = "plymouth-kcm-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz"; + sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk"; + name = "plymouth-kcm-5.12.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.12.2"; + version = "1-5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/polkit-kde-agent-1-5.12.2.tar.xz"; - sha256 = "176wb8sh9r4f1ij604x52w4q5nbhmnqwxid3w107cqwpydnh0dm9"; - name = "polkit-kde-agent-1-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/polkit-kde-agent-1-5.12.3.tar.xz"; + sha256 = "0kb2ijjfqncrw02lrkh6jw2g2rps7aqs7v20gjdam9sacmnwy5j0"; + name = "polkit-kde-agent-1-5.12.3.tar.xz"; }; }; powerdevil = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/powerdevil-5.12.2.tar.xz"; - sha256 = "0b9m3jm0ar84b2ln1ml5lk26nryrrlis7kj46whzqicwpdi7dpxw"; - name = "powerdevil-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz"; + sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484"; + name = "powerdevil-5.12.3.tar.xz"; }; }; sddm-kcm = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/sddm-kcm-5.12.2.tar.xz"; - sha256 = "0nh8kviqn43zh6kdqzfcqksp48k1brd8bg4kni2cbmzif6md3ay3"; - name = "sddm-kcm-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz"; + sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2"; + name = "sddm-kcm-5.12.3.tar.xz"; }; }; systemsettings = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/systemsettings-5.12.2.tar.xz"; - sha256 = "06cfxydpcnzi5g6ipi7sgiswgrzhnksgyhsp56zgqdswbilanp4n"; - name = "systemsettings-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz"; + sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali"; + name = "systemsettings-5.12.3.tar.xz"; }; }; user-manager = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/user-manager-5.12.2.tar.xz"; - sha256 = "047bssxfs8z1lhg25f263fq05w6m22mdk5i16ji5i11n26v8hdwa"; - name = "user-manager-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz"; + sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh"; + name = "user-manager-5.12.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.12.2"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.12.2/xdg-desktop-portal-kde-5.12.2.tar.xz"; - sha256 = "1gr07p281icc2v7cv3n6rzi1c70ddkwiw12n9klk3sxprjxmc0pm"; - name = "xdg-desktop-portal-kde-5.12.2.tar.xz"; + url = "${mirror}/stable/plasma/5.12.3/xdg-desktop-portal-kde-5.12.3.tar.xz"; + sha256 = "0swy8kcczvs2ariyjrkln6mvc0xqrjznpkhw5gzyh61v3hpddgk9"; + name = "xdg-desktop-portal-kde-5.12.3.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 009416dea6c..17fd08faf69 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -7,14 +7,14 @@ let inherit (stdenv.lib) optional; p_name = "xfce4-panel"; ver_maj = "4.12"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck"; + sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2"; }; patches = [ ./xfce4-panel-datadir.patch ]; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index d861e5f2d55..313a2662f03 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -3,14 +3,14 @@ let p_name = "xfwm4"; ver_maj = "4.12"; - ver_min = "3"; + ver_min = "4"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"; + sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s"; }; buildInputs = diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-13/automakeAddFlags.sh new file mode 100644 index 00000000000..92d5659d05c --- /dev/null +++ b/pkgs/desktops/xfce4-13/automakeAddFlags.sh @@ -0,0 +1,7 @@ +automakeAddFlags() { + local file="$1" + local target="$2" + local source="$3" + + sed "/$target/a\$($source) \\\\" -i $file +} diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix new file mode 100644 index 00000000000..451322bcaf9 --- /dev/null +++ b/pkgs/desktops/xfce4-13/default.nix @@ -0,0 +1,80 @@ +{ lib, makeSetupHook, newScope, gnome3, gst_all_1 }: + +let + inherit (lib) makeScope; +in + +makeScope newScope (self: with self; { + mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; + + automakeAddFlags = makeSetupHook { } ./automakeAddFlags.sh; + + exo = callPackage ./exo { }; + + garcon = callPackage ./garcon { }; + + gigolo = callPackage ./gigolo { }; + + libxfce4util = callPackage ./libxfce4util { }; + + libxfce4ui = callPackage ./libxfce4ui { }; + + mousepad = callPackage ./mousepad { + inherit (gnome3) gtksourceview; + }; + + orage = callPackage ./orage { }; + + parole = callPackage ./parole { + inherit (gst_all_1) gst-plugins-bad gst-plugins-base gst-plugins-good; + gst-plugins-ugly = null; + }; + + ristretto = callPackage ./ristretto { }; + + thunar = callPackage ./thunar { }; + + thunar-volman = callPackage ./thunar-volman { }; + + tumbler = callPackage ./tumbler { }; + + xfburn = callPackage ./xfburn { }; + + xfconf = callPackage ./xfconf { }; + + xfdesktop = callPackage ./xfdesktop { }; + + xfce4-appfinder = callPackage ./xfce4-appfinder { }; + + xfce4-dev-tools = callPackage ./xfce4-dev-tools { + mkXfceDerivation = mkXfceDerivation.override { + xfce4-dev-tools = null; + }; + }; + + xfce4-dict = callPackage ./xfce4-dict { }; + + xfce4-mixer = callPackage ./xfce4-mixer { }; + + xfce4-notifyd = callPackage ./xfce4-notifyd { }; + + xfce4-panel = callPackage ./xfce4-panel { }; + + xfce4-power-manager = callPackage ./xfce4-power-manager { }; + + xfce4-screenshooter = callPackage ./xfce4-screenshooter { + inherit (gnome3) libsoup; + }; + + xfce4-taskmanager = callPackage ./xfce4-taskmanager { }; + + xfce4-settings = callPackage ./xfce4-settings { }; + + xfce4-terminal = callPackage ./xfce4-terminal { + inherit (gnome3) vte; + }; + + xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; + + xfwm4 = callPackage ./xfwm4 { }; +}) diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix new file mode 100644 index 00000000000..e11309135dd --- /dev/null +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -0,0 +1,23 @@ +{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3 +, libxfce4ui, libxfce4util }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "exo"; + version = "0.11.5"; + + sha256 = "0zxv7cx1xbjls7q2blv8ir9zwzyq7r189n6q35jwasns7rxj256v"; + + nativeBuildInputs = [ libxslt perlPackages.URI ]; + buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; + + postPatch = '' + substituteInPlace docs/reference/Makefile.am \ + --replace http://docbook.sourceforge.net/release/xsl/current \ + ${docbook_xml_xslt}/share/xml/docbook-xsl + ''; + + meta = { + description = "Application library for Xfce"; + }; +} diff --git a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch new file mode 100644 index 00000000000..74e6f812e3c --- /dev/null +++ b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch @@ -0,0 +1,28 @@ +diff -urNZ a/configure.ac.in b/configure.ac.in +--- a/configure.ac.in 2017-11-20 02:57:40.476664918 +0000 ++++ b/configure.ac.in 2017-11-20 03:07:18.999128370 +0000 +@@ -165,11 +165,9 @@ + dnl *********************************** + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) + XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) +-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) + XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) + +diff -urNZ a/exo/Makefile.am b/exo/Makefile.am +--- a/exo/Makefile.am 2017-11-20 02:57:34.444785202 +0000 ++++ b/exo/Makefile.am 2017-11-20 03:00:49.402897465 +0000 +@@ -117,7 +117,7 @@ + + libexo_2_includedir = $(includedir)/exo-2/exo + +-lib_LTLIBRARIES += libexo-2.la ++lib_LTLIBRARIES = libexo-2.la + + libexo_2_include_HEADERS = \ + exo.h \ +Binary files a/.git/index and b/.git/index differ diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch new file mode 100644 index 00000000000..fda36d69651 --- /dev/null +++ b/pkgs/desktops/xfce4-13/garcon/12700.patch @@ -0,0 +1,37 @@ +From: Yegor Timoshenko <yegortimoshenko@gmail.com> +Date: Thu, 14 Dec 2017 21:13:02 +0000 +Subject: [PATCH] Decrement allocation counter on item unref (#12700) + +diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c +index 2017180..355e520 100644 +--- a/garcon/garcon-menu-item-pool.c ++++ b/garcon/garcon-menu-item-pool.c +@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, + g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); + g_return_val_if_fail (node != NULL, FALSE); + +- return garcon_menu_node_tree_rule_matches (node, item); ++ gboolean matches = garcon_menu_node_tree_rule_matches (node, item); ++ ++ if (matches) ++ garcon_menu_item_increment_allocated (item); ++ ++ return matches; + } + + +diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c +index ca8cb63..b44acfe 100644 +--- a/garcon/garcon-menu-item.c ++++ b/garcon/garcon-menu-item.c +@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item) + { + g_return_if_fail (GARCON_IS_MENU_ITEM (item)); + ++ garcon_menu_item_decrement_allocated (item); ++ + /* Decrement the reference counter */ + g_object_unref (G_OBJECT (item)); + } +-- +2.15.1 diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch new file mode 100644 index 00000000000..1b723d21d60 --- /dev/null +++ b/pkgs/desktops/xfce4-13/garcon/13785.patch @@ -0,0 +1,75 @@ +From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001 +From: Stefan Berzl <stefanberzl@gmail.com> +Date: Mon, 21 Aug 2017 18:39:07 +0300 +Subject: [PATCH] fix: some menu icons are too big (Bug #13785) + +Some packages only provide icons in sizes much bigger than the standard +GTK menu size of 16px. + +The clipboard manager qlipper for example provides the following icon: +/usr/share/icons/hicolor/128x128/apps/qlipper.png + +In GTK 3.22.18 the function gtk_image_new_from_icon_name when given +GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128. + +The patch I have supplied uses existing code to scale such an image. + +Signed-off-by: Eric Koegel <eric.koegel@gmail.com> +--- + garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c +index 41990f2..f31a1ed 100644 +--- a/garcon-gtk/garcon-gtk-menu.c ++++ b/garcon-gtk/garcon-gtk-menu.c +@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); + size = MIN (w, h); + +- if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) ++ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) ++ { ++ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);; ++ } ++ else + { + if (g_path_is_absolute (icon_name)) + { +@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) + g_free (name); + } + } ++ } + +- /* Turn the pixbuf into a gtk_image */ +- if (G_LIKELY (pixbuf)) +- { +- /* scale the pixbuf down if it needs it */ +- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); +- g_object_unref (pixbuf); +- pixbuf = tmp; ++ /* Turn the pixbuf into a gtk_image */ ++ if (G_LIKELY (pixbuf)) ++ { ++ /* scale the pixbuf down if it needs it */ ++ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); ++ g_object_unref (G_OBJECT (pixbuf)); + +- image = gtk_image_new_from_pixbuf (pixbuf); +- g_object_unref (G_OBJECT (pixbuf)); +- } ++ image = gtk_image_new_from_pixbuf (pixbuf_scaled); ++ g_object_unref (G_OBJECT (pixbuf_scaled)); ++ } ++ else ++ { ++ /* display the placeholder at least */ ++ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + } +- +- if (image == NULL) +- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + + return image; + } diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix new file mode 100644 index 00000000000..a88d64702a1 --- /dev/null +++ b/pkgs/desktops/xfce4-13/garcon/default.nix @@ -0,0 +1,12 @@ +{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "garcon"; + version = "0.6.1"; + + sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8"; + + patches = [ ./12700.patch ./13785.patch ]; + buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; +} diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix new file mode 100644 index 00000000000..0d7b2210b12 --- /dev/null +++ b/pkgs/desktops/xfce4-13/gigolo/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, gtk2, libX11 }: + +mkXfceDerivation rec { + category = "apps"; + pname = "gigolo"; + version = "0.4.2"; + + sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1"; + + buildInputs = [ gtk2 libX11 ]; +} diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix new file mode 100644 index 00000000000..63df0b7cc9a --- /dev/null +++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3 +, libstartup_notification ? null, libxfce4util, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "libxfce4ui"; + version = "4.13.4"; + + sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy"; + + buildInputs = [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ]; + propagatedBuildInputs = [ libxfce4util ]; + + meta = with lib; { + description = "Widgets library for Xfce"; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix new file mode 100644 index 00000000000..091d73bf72a --- /dev/null +++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix @@ -0,0 +1,16 @@ +{ lib, mkXfceDerivation, gobjectIntrospection }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "libxfce4util"; + version = "4.13.1"; + + sha256 = "001ls90an2pi9l04g3r6syfa4lhyvjymp0r9djxrkc2q493mcv3d"; + + buildInputs = [ gobjectIntrospection ]; + + meta = with lib; { + description = "Extension library for Xfce"; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix new file mode 100644 index 00000000000..f08272e9db0 --- /dev/null +++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools ? null }: + +{ category, pname, sha256 ? null, version, ... } @ args: + +let + inherit (builtins) filter getAttr head isList; + inherit (stdenv.lib) attrNames concatLists recursiveUpdate zipAttrsWithNames; + + filterAttrNames = f: attrs: + filter (n: f (getAttr n attrs)) (attrNames attrs); + + concatAttrLists = attrsets: + zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; + + template = rec { + name = "${pname}-${version}"; + + nativeBuildInputs = [ pkgconfig xfce4-dev-tools ]; + configureFlags = [ "--enable-maintainer-mode" ]; + + src = fetchgit { + url = "git://git.xfce.org/${category}/${pname}"; + rev = name; + inherit sha256; + }; + + enableParallelBuilding = true; + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + homepage = "https://git.xfce.org/${category}/${pname}/about"; + license = licenses.gpl2; # some libraries are under LGPLv2+ + platforms = platforms.linux; + }; + }; + + publicArgs = removeAttrs args [ "category" "pname" "sha256" ]; +in + +stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ]) diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix new file mode 100644 index 00000000000..84206f763f3 --- /dev/null +++ b/pkgs/desktops/xfce4-13/mousepad/default.nix @@ -0,0 +1,12 @@ +{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }: + +mkXfceDerivation rec { + category = "apps"; + pname = "mousepad"; + version = "0.4.0"; + + sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw"; + + nativeBuildInputs = [ exo wrapGAppsHook ]; + buildInputs = [ dbus_glib gtk3 gtksourceview ]; +} diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix new file mode 100644 index 00000000000..6a2f37cbef6 --- /dev/null +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null +, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: + +assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; + +let + inherit (lib) optionals; +in + +mkXfceDerivation rec { + category = "apps"; + pname = "orage"; + version = "4.12.1"; + + sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; + buildInputs = [ dbus_glib gtk2 libical libnotify popt ] + ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; +} diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix new file mode 100644 index 00000000000..c1976727c04 --- /dev/null +++ b/pkgs/desktops/xfce4-13/parole/default.nix @@ -0,0 +1,36 @@ +{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus_glib +, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good +, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util +, taglib ? null, xfconf }: + +# Doesn't seem to find H.264 codec even though built with gst-plugins-bad. + +mkXfceDerivation rec { + category = "apps"; + pname = "parole"; + version = "0.9.2"; + + sha256 = "07i9d7xn2ys3z71sxvr53idq4ivy94pqgxvr0k78crva39ls08s5"; + + postPatch = '' + substituteInPlace src/plugins/mpris2/Makefile.am \ + --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS + ''; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + buildInputs = [ + dbus + dbus_glib + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gtk3 + libnotify + libxfce4ui + libxfce4util + taglib + xfconf + ]; +} diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix new file mode 100644 index 00000000000..5296723eb40 --- /dev/null +++ b/pkgs/desktops/xfce4-13/ristretto/default.nix @@ -0,0 +1,18 @@ +{ mkXfceDerivation, automakeAddFlags, exo, dbus_glib, gtk2, libexif +, libxfce4ui, libxfce4util, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "ristretto"; + version = "0.8.2"; + + postPatch = '' + automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS + automakeAddFlags src/Makefile.am ristretto_LDADD DBUS_GLIB_LIBS + ''; + + nativeBuildInputs = [ automakeAddFlags exo ]; + buildInputs = [ dbus_glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; + + sha256 = "0ra50452ldk91pvhcpl3f3rhdssw3djfr6cm0hc29v8r58am0wni"; +} diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix new file mode 100644 index 00000000000..0055d0d8217 --- /dev/null +++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "thunar-volman"; + version = "0.9.0"; + + buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; + + sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7"; +} diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix new file mode 100644 index 00000000000..7503e67e4a5 --- /dev/null +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -0,0 +1,30 @@ +{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null +, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "thunar"; + version = "1.7.0"; + + sha256 = "1s262hii524a5hb15pb8xbrrrhyi5fj3837zgbscg3rdnsm52igw"; + + postPatch = '' + substituteInPlace docs/Makefile.am \ + --replace http://docbook.sourceforge.net/release/xsl/current \ + ${docbook_xml_xslt}/share/xml/docbook-xsl + ''; + + nativeBuildInputs = [ libxslt ]; + + buildInputs = [ + exo + gdk_pixbuf + gtk3 + libgudev + libnotify + libX11 + libxfce4ui + libxfce4util + xfconf + ]; +} diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix new file mode 100644 index 00000000000..6bcdbfbc41e --- /dev/null +++ b/pkgs/desktops/xfce4-13/tumbler/default.nix @@ -0,0 +1,14 @@ +{ mkXfceDerivation, gdk_pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null +, poppler ? null }: + +# TODO: add libopenraw + +mkXfceDerivation rec { + category = "xfce"; + pname = "tumbler"; + version = "0.2.0"; + + sha256 = "0jr6rhgc57yqb3iwp7y49yf5ig541liaz6xpvjl45ki34j091iaj"; + + buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ]; +} diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix new file mode 100644 index 00000000000..266722c9b05 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfburn/default.nix @@ -0,0 +1,18 @@ +{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfburn"; + version = "0.5.5"; + + postPatch = '' + substituteInPlace docs/Makefile.am \ + --replace http://docbook.sourceforge.net/release/xsl/current \ + ${docbook_xml_xslt}/share/xml/docbook-xsl + ''; + + sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; + + nativeBuildInputs = [ libxslt ]; + buildInputs = [ exo gtk2 libburn libICE libisofs libSM libxfce4ui ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix new file mode 100644 index 00000000000..65941fee4c4 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix @@ -0,0 +1,12 @@ +{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-appfinder"; + version = "4.13.0"; + + sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy"; + + nativeBuildInputs = [ exo ]; + buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix new file mode 100644 index 00000000000..88ed804191a --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -0,0 +1,31 @@ +{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-dev-tools"; + version = "4.12.0"; + + sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2"; + + nativeBuildInputs = [ autoreconfHook ]; + + propagatedNativeBuildInputs = [ + autoconf + automake + glib + gtk_doc + intltool + libtool + ]; + + preAutoreconf = '' + substitute configure.ac.in configure.ac \ + --subst-var-by REVISION UNKNOWN + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "Autoconf macros and scripts to augment app build systems"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh new file mode 100644 index 00000000000..600bf47fd87 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh @@ -0,0 +1,12 @@ +xdtEnvHook() { + addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros +} + +envHooks+=(xdtEnvHook) + +xdtAutogenPhase() { + mkdir -p m4 + NOCONFIGURE=1 xdt-autogen +} + +preConfigurePhases+=(xdtAutogenPhase) diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch new file mode 100644 index 00000000000..787b63511a2 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch @@ -0,0 +1,11 @@ +diff -urNZ a/configure.ac.in b/configure.ac.in +--- a/configure.ac.in 2017-12-16 19:46:13.784914017 +0000 ++++ b/configure.ac.in 2017-12-16 19:46:38.612477052 +0000 +@@ -53,6 +53,7 @@ + dnl *********************************** + dnl *** Check for required packages *** + dnl *********************************** ++XDT_CHECK_PACKAGE([GIO], [gio-unix-2.0], [2.32.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix new file mode 100644 index 00000000000..a5357ebd590 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix @@ -0,0 +1,19 @@ +{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-dict"; + version = "0.8.0"; + + sha256 = "1r1k9cgl7zkn3q4mjf7qjql6vlxkb2m0spgj9p646mw7bnhbf9wr"; + + patches = [ ./configure-gio.patch ]; + + nativeBuildInputs = [ automakeAddFlags ]; + + postPatch = '' + automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS + ''; + + buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix new file mode 100644 index 00000000000..96deb96e7f7 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix @@ -0,0 +1,30 @@ +{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2 +, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-mixer"; + version = "4.11.0"; + + sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys"; + + nativeBuildInputs = [ automakeAddFlags ]; + + postPatch = '' + automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS + automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS + ''; + + buildInputs = [ + dbus_glib + gst-plugins-base + gtk2 + libICE + libSM + libunique + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix new file mode 100644 index 00000000000..b4be0a35a13 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix @@ -0,0 +1,13 @@ +{ mkXfceDerivation, dbus_glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util +, xfce4-panel, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-notifyd"; + version = "0.4.1"; + + sha256 = "12mqi0q1hcjm16f4pndq7l58h2n0nq160r5fqx8ns320i83nh94k"; + + nativeBuildInputs = [ dbus_glib exo ]; + buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix new file mode 100644 index 00000000000..88ba2de49be --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -0,0 +1,15 @@ +{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-panel"; + version = "4.13.2"; + + sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn"; + + buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; + + meta = { + description = "Xfce's panel"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix new file mode 100644 index 00000000000..bf998d2e819 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix @@ -0,0 +1,19 @@ +{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify +, libxfce4ui, libxfce4util, upower, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-power-manager"; + version = "1.6.0"; + + sha256 = "1sh6ydn44j1yki8f020ljayp1fjcigkywcvjp38fsk7j25ni2wrp"; + + nativeBuildInputs = [ automakeAddFlags exo ]; + buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; + + postPatch = '' + substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 + automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS + automakeAddFlags src/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS + ''; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix new file mode 100644 index 00000000000..5e2c296f056 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-screenshooter"; + version = "1.9.1"; + + sha256 = "1q13hvaz3ykrbgbbqb1186mhri8r9hkmpaayjwhnkvjm7jfyhbin"; + + buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix new file mode 100644 index 00000000000..235c5cd15e4 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix @@ -0,0 +1,39 @@ +{ mkXfceDerivation, automakeAddFlags, dbus_glib, exo, garcon, gtk3 +, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null +, upower ? null, xfconf, xf86inputlibinput ? null }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfce4-settings"; + version = "4.13.1"; + + sha256 = "010vcgy3qiqykk174jhf50a8q3x4a5qq2lf6b0wcbyzv7aikydrw"; + + postPatch = '' + automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS + for f in $(find . -name \*.c); do + substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>' + done + ''; + + nativeBuildInputs = [ automakeAddFlags ]; + + buildInputs = [ + dbus_glib + exo + garcon + gtk3 + libnotify + libxfce4ui + libxfce4util + libxklavier + upower + xfconf + xf86inputlibinput + ]; + + configureFlags = [ + "--enable-pluggable-dialogs" + "--enable-sound-settings" + ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix new file mode 100644 index 00000000000..c2d80e31f15 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix @@ -0,0 +1,18 @@ +{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }: + +let + inherit (lib) enableFeature; +in + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-taskmanager"; + version = "1.2.0"; + + sha256 = "1lx66lhzfzhysymcbzfq9nrafyfmwdb79lli9kvhz6m12dhz6j18"; + + nativeBuildInputs = [ exo ]; + buildInputs = [ gtk2 gtk3 libwnck3 libXmu ]; + + configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix new file mode 100644 index 00000000000..de37e4071fe --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix @@ -0,0 +1,15 @@ +{ mkXfceDerivation, gtk3, libxfce4ui, vte }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-terminal"; + version = "0.8.6"; + + sha256 = "1a0b2ih552zhbbx1fc5ad80nafvkc5my3gw89as4mvycnhyd5inj"; + + buildInputs = [ gtk3 libxfce4ui vte ]; + + meta = { + description = "A modern terminal emulator"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix new file mode 100644 index 00000000000..e7f13e104c8 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix @@ -0,0 +1,15 @@ +{ lib, mkXfceDerivation, gtk2, libnotify ? null, libpulseaudio, keybinder, xfconf }: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfce4-volumed-pulse"; + version = "0.2.2"; + + sha256 = "0ccb98b433lx5fgdqd3nqqppg4sldr5p1is6pnx85h9wyxx5svhp"; + + buildInputs = [ gtk2 libnotify libpulseaudio keybinder xfconf ]; + + meta = with lib; { + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix new file mode 100644 index 00000000000..8280922d1c7 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfconf/default.nix @@ -0,0 +1,11 @@ +{ mkXfceDerivation, libxfce4util }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfconf"; + version = "4.13.4"; + + sha256 = "1bm4q06rwlmkmcy6qnwm6l70w6749iqfrmsrgj3y1jb2sacc3pd4"; + + buildInputs = [ libxfce4util ]; +} diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix new file mode 100644 index 00000000000..7ce32424b9b --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix @@ -0,0 +1,22 @@ +{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfdesktop"; + version = "4.13.1"; + + sha256 = "0idc8j44apflvdasnvj7ld0fa8mxlwpndfqzbh97w54s8972gf6g"; + + buildInputs = [ + exo + gtk3 + libxfce4ui + libxfce4util + libwnck3 + xfconf + ]; + + meta = { + description = "Xfce's desktop manager"; + }; +} diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix new file mode 100644 index 00000000000..d5de6817300 --- /dev/null +++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix @@ -0,0 +1,27 @@ +{ mkXfceDerivation, exo, dbus_glib, epoxy ? null, gtk2, libICE, libSM +, libstartup_notification ? null, libxfce4ui, libxfce4util, libwnck +, libXpresent ? null, xfconf }: + +mkXfceDerivation rec { + category = "xfce"; + pname = "xfwm4"; + version = "4.13.0"; + + sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9"; + + nativeBuildInputs = [ exo ]; + + buildInputs = [ + dbus_glib + epoxy + gtk2 + libICE + libSM + libstartup_notification + libxfce4ui + libxfce4util + libwnck + libXpresent + xfconf + ]; +} |