diff options
Diffstat (limited to 'pkgs/desktops/gnome-3')
18 files changed, 75 insertions, 579 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index fe8977646f6da..ac1e9ee85c015 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gnome3 +, glib +, gtk3 +, pango +, wrapGAppsHook +, python3 +, gobject-introspection +, gjs +, libunistring +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +}: stdenv.mkDerivation rec { pname = "gnome-characters"; @@ -10,30 +27,54 @@ stdenv.mkDerivation rec { sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js"; }; + nativeBuildInputs = [ + gettext + gobject-introspection + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; + + + buildInputs = [ + adwaita-icon-theme + gjs + glib + gnome-desktop # for typelib + gsettings-desktop-schemas + gtk3 + libunistring + pango + ]; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; + dontWrapGApps = true; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postFixup = '' + for file in $out/share/org.gnome.Characters/org.gnome.Characters \ + $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService + do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + + wrapProgram $file "''${gappsWrapperArgs[@]}" + done + ''; + passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-characters"; - attrPath = "gnome3.gnome-characters"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; - buildInputs = [ - glib gtk3 gjs pango gsettings-desktop-schemas - adwaita-icon-theme libunistring - # typelib - gnome-desktop - ]; - - mesonFlags = [ - "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; description = "Simple utility application to find and insert unusual characters"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index a729a924f6bbb..5978fb217e87e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,8 +1,8 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig , wrapGAppsHook, itstool, desktop-file-utils, python3 -, glib, gtk3, evolution-data-server +, glib, gtk3, evolution-data-server, gnome-online-accounts , libuuid, webkitgtk, zeitgeist -, gnome3, libxml2, gsettings-desktop-schemas }: +, gnome3, libxml2, gsettings-desktop-schemas, tracker }: let version = "3.32.2"; @@ -27,8 +27,8 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libuuid webkitgtk gnome3.tracker - gnome3.gnome-online-accounts zeitgeist + glib gtk3 libuuid webkitgtk tracker + gnome-online-accounts zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix deleted file mode 100644 index e5bd4d8b950f7..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, gettext, fetchurl, libxml2, libgdata -, pkgconfig, gtk3, glib, tracker, tracker-miners -, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins -, grilo, gnome-online-accounts -, desktop-file-utils, wrapGAppsHook -, gnome3, gdk-pixbuf, gexiv2, geocode-glib -, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }: - -let - pname = "gnome-photos"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj"; - }; - - # doCheck = true; - - nativeBuildInputs = [ - pkgconfig gettext itstool meson ninja libxml2 - desktop-file-utils wrapGAppsHook python3 - ]; - buildInputs = [ - gtk3 glib gegl babl libgdata libdazzle - gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - gfbgraph grilo-plugins grilo - gnome-online-accounts tracker - gexiv2 geocode-glib dleyna-renderer - tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema - dbus - ]; - - 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/Photos; - description = "Access, organize and share your photos"; - maintainers = gnome3.maintainers; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix deleted file mode 100644 index 9ae4a572d93ba..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook -, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection -, gettext, icu, glib-networking, hicolor-icon-theme -, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos -}: - -let - pname = "gnome-online-accounts"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"; - }; - - outputs = [ "out" "man" "dev" "devdoc" ]; - - configureFlags = [ - "--enable-media-server" - "--enable-kerberos" - "--enable-lastfm" - "--enable-todoist" - "--enable-gtk-doc" - "--enable-documentation" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkgconfig gobject-introspection vala gettext wrapGAppsHook - libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc - hicolor-icon-theme # for setup-hook - ]; - buildInputs = [ - glib gtk3 webkitgtk json-glib librest libsecret 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/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix deleted file mode 100644 index 118a910a16837..0000000000000 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, fetchurl -, meson -, ninja -, pkgconfig -, gettext -, gperf -, sqlite -, librest -, libarchive -, libsoup -, gnome3 -, libxml2 -, lua5_3 -, liboauth -, libgdata -, libmediaart -, grilo -, gnome-online-accounts -, gmime -, json-glib -, avahi -, tracker -, dleyna-server -, itstool -, totem-pl-parser -}: - -stdenv.mkDerivation rec { - pname = "grilo-plugins"; - version = "0.3.9"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1"; - }; - - nativeBuildInputs = [ - meson - ninja - pkgconfig - gettext - itstool - gperf # for lua-factory - ]; - - buildInputs = [ - grilo - libxml2 - libgdata - lua5_3 - liboauth - sqlite - gnome-online-accounts - totem-pl-parser - librest - libarchive - libsoup - gmime - json-glib - avahi - libmediaart - tracker - dleyna-server - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = gnome3.maintainers; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix deleted file mode 100644 index 33293f0b3cbde..0000000000000 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch -, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: - -let - pname = "grilo"; - version = "0.3.9"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - outputs = [ "out" "dev" "man" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; - }; - - setupHook = ./setup-hook.sh; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - patches = [ - # https://gitlab.gnome.org/GNOME/grilo/merge_requests/45 - # commits are from a separate branch so they shouldn't 404 - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch"; - sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch"; - sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch"; - sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w"; - }) - ]; - - nativeBuildInputs = [ - meson ninja pkgconfig gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 - ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh deleted file mode 100644 index 9337c520a2075..0000000000000 --- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -make_grilo_find_plugins() { - if [ -d "$1"/lib/grilo-0.3 ]; then - addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3" - fi -} - -addEnvHooks "$hostOffset" make_grilo_find_plugins diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 854ce9364468d..14551fb7d0c3e 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -7,13 +7,13 @@ let pname = "nautilus"; - version = "3.32.1"; + version = "3.32.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0vmrvimv4183l3ij4kv0ir2c9rfzk7gh3xc2pa4wkqq9kn7h6m7s"; + sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix deleted file mode 100644 index eaa3ab3c089be..0000000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ stdenv -, fetchurl -, substituteAll -, intltool -, itstool -, libxslt -, gexiv2 -, tracker -, meson -, ninja -, pkgconfig -, vala -, wrapGAppsHook -, bzip2 -, dbus -, evolution-data-server -, exempi -, flac -, giflib -, glib -, gnome3 -, gst_all_1 -, icu -, json-glib -, libcue -, libexif -, libgrss -, libgsf -, libgxps -, libiptcdata -, libjpeg -, libosinfo -, libpng -, libseccomp -, libsoup -, libtiff -, libuuid -, libvorbis -, libxml2 -, poppler -, taglib -, upower -, totem-pl-parser -}: - -stdenv.mkDerivation rec { - pname = "tracker-miners"; - version = "2.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw"; - }; - - nativeBuildInputs = [ - intltool - itstool - libxslt - meson - ninja - pkgconfig - vala - wrapGAppsHook - ]; - - # TODO: add libenca, libosinfo - buildInputs = [ - bzip2 - dbus - evolution-data-server - exempi - flac - giflib - glib - gexiv2 - totem-pl-parser - tracker - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - icu - json-glib - libcue - libexif - libgrss - libgsf - libgxps - libiptcdata - libjpeg - libosinfo - libpng - libseccomp - libsoup - libtiff - libuuid - libvorbis - libxml2 - poppler - taglib - upower - ]; - - mesonFlags = [ - # TODO: tests do not like our sandbox - "-Dfunctional_tests=false" - "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit (gnome3) tracker; - }) - # https://bugzilla.gnome.org/show_bug.cgi?id=795576 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371427; - sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; - }) - ]; - - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch deleted file mode 100644 index 724c51cb56f8e..0000000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/libtracker-miners-common/tracker-domain-ontology.c -+++ b/src/libtracker-miners-common/tracker-domain-ontology.c -@@ -323,7 +323,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)) { -@@ -388,7 +388,7 @@ - if (!priv->ontology_location) { - gchar *ontology_path; - -- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies", -+ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies", - priv->ontology_name, NULL); - - if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) { diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix deleted file mode 100644 index 397184f798a8f..0000000000000 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobject-introspection, python3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales -, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib -, substituteAll}: - -let - pname = "tracker"; - version = "2.2.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6"; - }; - - nativeBuildInputs = [ - meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales - python3 # for data-generators - ]; - - buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer - ]; - - LC_ALL = "en_US.UTF-8"; - - mesonFlags = [ - "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - "-Dfunctional_tests=false" - "-Ddocs=true" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; - }) - ]; - - postPatch = '' - patchShebangs utils/g-ir-merge/g-ir-merge - patchShebangs utils/data-generators/cc/generate - ''; - - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch deleted file mode 100644 index f5c13c3fcdaf3..0000000000000 --- a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/tracker-store/tracker-store.desktop.in -+++ b/src/tracker-store/tracker-store.desktop.in -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Tracker Store - Comment=Metadata database store and lookup manager --Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 -+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 - Terminal=false - Type=Application - Categories=Utility; - X-GNOME-Autostart-enabled=true diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 87b7be5bdd2f4..7820c32e2a698 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -37,7 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan gnome-terminal gnome-user-docs evolution file-roller gedit - gnome-clocks gnome-music gnome-tweaks gnome-photos + gnome-clocks gnome-music gnome-tweaks pkgs.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 @@ -113,8 +113,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; - gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; @@ -141,10 +139,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-user-share = callPackage ./core/gnome-user-share { }; - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; @@ -196,10 +190,6 @@ lib.makeScope pkgs.newScope (self: with self; { totem = callPackage ./core/totem { }; - tracker = callPackage ./core/tracker { }; - - tracker-miners = callPackage ./core/tracker-miners { }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; @@ -251,10 +241,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-notes = callPackage ./apps/gnome-notes { }; - gnome-photos = callPackage ./apps/gnome-photos { - gegl = gegl_0_4; - }; - gnome-power-manager = callPackage ./apps/gnome-power-manager { }; gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; @@ -351,8 +337,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-autoar = callPackage ./misc/gnome-autoar { }; - gnome-video-effects = callPackage ./misc/gnome-video-effects { }; - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; } // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases @@ -392,6 +376,9 @@ lib.makeScope pkgs.newScope (self: with self; { easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 + inherit (pkgs) gnome-video-effects; # added 2019-08-19 + inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 + defaultIconTheme = adwaita-icon-theme; gtk = gtk3; gtkmm = gtkmm3; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 659339c3b7707..7b06992216968 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-nibbles"; - version = "3.31.3"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18"; + sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 72cce760b03e1..657bf4a76391a 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.31.92"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m2w3zz6v1bsd1fn78ab79d72ywd9vq60rziazsblxsi4qy9dva5"; + sha256 = "15s20db2fq4cy031sw20pmf53hxiak44fgyjy5njqnp2h2sg3806"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index fdda49306451f..f196ada38504c 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v"; + sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 54d45eedc3d9a..8babe77e4121a 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07y5ii5bn7fgdpr88307fwxiafm5fwdxmzwhi6h1y4z880nnzp7f"; + sha256 = "0sg53zq81v28hdqiy5d048skwfgsa8ck0z7ywsagdh7iaqin68gq"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix deleted file mode 100644 index b65e9c1021e70..0000000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: -let - pname = "gnome-video-effects"; - version = "0.4.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "A collection of GStreamer effects to be used in different GNOME Modules"; - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} |