diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps')
18 files changed, 445 insertions, 108 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix index c0ca54d6fec8..f05eb41d35e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -15,15 +15,15 @@ , adwaita-icon-theme }: - python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "accerciser"; - version = "3.36.3"; + version = "3.38.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zfhmpaqqwm89k8p4apq4la191icjvqh0097p5aig3yhy87fahp9"; + sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix index 05a1cdbc088e..c4998cc451fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,17 +1,46 @@ -{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 -, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib -, libxslt, yelp-tools, gnome-common, gtk-doc -, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 -, meson, ninja, dbus, python3 }: +{ stdenv +, gettext +, fetchurl +, wrapGAppsHook +, gnome-video-effects +, libcanberra-gtk3 +, pkgconfig +, gtk3 +, glib +, clutter-gtk +, clutter-gst +, udev +, gst_all_1 +, itstool +, libgudev +, vala +, docbook_xml_dtd_43 +, docbook_xsl +, appstream-glib +, libxslt +, yelp-tools +, gnome-common +, gtk-doc +, adwaita-icon-theme +, librsvg +, totem +, gdk-pixbuf +, gnome3 +, gnome-desktop +, libxml2 +, meson +, ninja +, dbus +, python3 +}: stdenv.mkDerivation rec { pname = "cheese"; - version = "3.34.0"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni"; + sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; postPatch = '' @@ -24,15 +53,43 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib - libxslt docbook_xml_dtd_43 docbook_xsl - gtk-doc yelp-tools gnome-common python3 + appstream-glib + docbook_xml_dtd_43 + docbook_xsl + gettext + gnome-common + gtk-doc + itstool + libxml2 + libxslt + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + yelp-tools + ]; + + buildInputs = [ + adwaita-icon-theme + clutter-gst + clutter-gtk + dbus + gdk-pixbuf + glib + gnome-desktop + gnome-video-effects + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk3 + libcanberra-gtk3 + libgudev + librsvg + udev ]; - buildInputs = [ gtk3 glib gnome-video-effects - gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop - gst_all_1.gst-plugins-bad clutter-gtk clutter-gst - libcanberra-gtk3 libgudev dbus ]; outputs = [ "out" "man" "devdoc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix index f27050cd68f7..6bb2e139cba0 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.5"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hpjd5d3z52xcjcc1hg5z8ypnx2y6ml9snyrlpflg9bx16yhxm1x"; + sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 7c518c4acd9f..29e482135a2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.36.3"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dw1vfnfc44k57b6mip8fv565d2xv5wrigi4js044x3sbl5f2n89"; + sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj"; }; LANG = "en_US.UTF-8"; # postinstall.py diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix index ea33bc29324f..f3219e74bcae 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,29 +1,56 @@ -{ stdenv, meson, fetchurl, python3 -, pkgconfig, gtk3, glib, adwaita-icon-theme -, libpeas, gtksourceview4, gsettings-desktop-schemas -, wrapGAppsHook, ninja, libsoup, tepl -, gnome3, gspell, perl, itstool, desktop-file-utils +{ stdenv +, meson +, fetchurl +, python3 +, pkgconfig +, gtk3 +, glib +, adwaita-icon-theme +, libpeas +, gtksourceview4 +, gsettings-desktop-schemas +, wrapGAppsHook +, ninja +, libsoup +, tepl +, gnome3 +, gspell +, perl +, itstool +, desktop-file-utils +, vala }: stdenv.mkDerivation rec { pname = "gedit"; - version = "3.36.2"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8"; + sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook meson ninja - python3 perl itstool desktop-file-utils + desktop-file-utils + itstool + meson + ninja + perl + pkgconfig + python3 + vala + wrapGAppsHook ]; buildInputs = [ - gtk3 glib - adwaita-icon-theme libsoup - libpeas gtksourceview4 - gsettings-desktop-schemas gspell + adwaita-icon-theme + glib + gsettings-desktop-schemas + gspell + gtk3 + gtksourceview4 + libpeas + libsoup tepl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 7432e8e96ed2..e7ea02a27495 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -1,9 +1,30 @@ -{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt -, webkitgtk, gnome-desktop, libgepub, gnome3, gdk-pixbuf -, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl -, docbook_xml_dtd_42, desktop-file-utils, python3 -, gobject-introspection, wrapGAppsHook }: +{ stdenv +, meson +, ninja +, gettext +, fetchurl +, evince +, gjs +, pkgconfig +, gtk3 +, glib +, tracker +, tracker-miners +, libxslt +, webkitgtk +, gnome-desktop +, libgepub +, gnome3 +, gdk-pixbuf +, gsettings-desktop-schemas +, adwaita-icon-theme +, docbook_xsl +, docbook_xml_dtd_42 +, desktop-file-utils +, python3 +, gobject-introspection +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gnome-books"; @@ -15,15 +36,32 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext libxslt desktop-file-utils - docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 + meson + ninja + pkgconfig + gettext + libxslt + desktop-file-utils + docbook_xsl + docbook_xml_dtd_42 + wrapGAppsHook + python3 ]; buildInputs = [ - gtk3 glib gsettings-desktop-schemas - gdk-pixbuf adwaita-icon-theme evince - webkitgtk gjs gobject-introspection tracker - tracker-miners gnome-desktop libgepub + gtk3 + glib + gsettings-desktop-schemas + gdk-pixbuf + adwaita-icon-theme + evince + webkitgtk + gjs + gobject-introspection + tracker + tracker-miners + gnome-desktop + libgepub ]; postPatch = '' @@ -39,6 +77,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; maintainers = teams.gnome.members; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 4acc687da8ba..7f0c7c4f621d 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -11,12 +11,15 @@ , gobject-introspection , libxml2 , gtk3 +, gtksourceview4 , gtk-vnc , freerdp , libvirt , spice-gtk , python3 +, appstream-glib , spice-protocol +, libhandy_0 , libsoup , libosinfo , systemd @@ -51,16 +54,17 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.36.6"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c3cw90xqqcpacc2z06ljs0gg8saxizfgjzg9alhpwgz3gl4c5pg"; + sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; }; doCheck = true; nativeBuildInputs = [ + appstream-glib # for appstream-util desktop-file-utils gettext gobject-introspection @@ -89,12 +93,14 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme gtk-vnc gtk3 + gtksourceview4 json-glib libapparmor libarchive libcap libcap_ng libgudev + libhandy_0 libosinfo librsvg libsecret diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 988cb1ed2a33..1311bea08d43 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,18 +1,45 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 -, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup -, glib, gnome-online-accounts, gsettings-desktop-schemas, libhandy }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, wrapGAppsHook +, libdazzle +, libgweather +, geoclue2 +, geocode-glib +, python3 +, gettext +, libxml2 +, gnome3 +, gtk3 +, evolution-data-server +, libsoup +, glib +, gnome-online-accounts +, gsettings-desktop-schemas +, libhandy +, adwaita-icon-theme +}: -let +stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "3.36.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04pmjzwcy1lswkri30rnvac99dff8zajs41as0j1cqrd1058i03j"; }; + patches = [ + # Port to libhandy-1 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; + sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; + }) + ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -20,10 +47,29 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + libxml2 + wrapGAppsHook + python3 + ]; + buildInputs = [ - gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib - gsettings-desktop-schemas gnome3.adwaita-icon-theme libhandy + gtk3 + evolution-data-server + libsoup + glib + gnome-online-accounts + libdazzle + libgweather + geoclue2 + geocode-glib + gsettings-desktop-schemas + adwaita-icon-theme + libhandy ]; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 5e3ff58b2901..1ffd15cfc14f 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.36.2"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rjicycgh9jvkqir2m8hx9m4jlaa3w5lqs43k185wa0zxhi1n6zi"; + sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix new file mode 100644 index 000000000000..02c2a4f3da84 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, fetchurl +, gnome3 +, meson +, ninja +, vala +, pkg-config +, glib +, gtk3 +, python3 +, libxml2 +, gtk-vnc +, gettext +, desktop-file-utils +, appstream-glib +, gobject-introspection +, freerdp +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-connections"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz"; + hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + glib # glib-compile-resources + meson + appstream-glib + ninja + pkg-config + python3 + vala + wrapGAppsHook + + # for gtk-frdp subproject + gobject-introspection + ]; + + buildInputs = [ + glib + gtk-vnc + gtk3 + libxml2 + + # for gtk-frdp subproject + freerdp + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "connections"; + attrPath = "gnome-connections"; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/connections"; + description = "A remote desktop client for the GNOME desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 8d5501537a0f..ec1268f07701 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -3,6 +3,7 @@ , ninja , gettext , fetchurl +, fetchpatch , evince , gjs , pkgconfig @@ -28,6 +29,7 @@ , desktop-file-utils , wrapGAppsHook , python3 +, appstream-glib , gsettings-desktop-schemas }: @@ -40,6 +42,14 @@ stdenv.mkDerivation rec { sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; }; + patches = [ + # Fix inkscape 1.0 usage + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff"; + sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s"; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -52,6 +62,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 wrapGAppsHook python3 + appstream-glib # building getting started inkscape @@ -92,6 +103,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" ''; + preConfigure = + # To silence inkscape warnings regarding profile directory + '' + export INKSCAPE_PROFILE_DIR="$(mktemp -d)" + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -100,6 +117,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; maintainers = teams.gnome.members; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index bd02a5f0cc60..79b3be3ae3db 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.36.2"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504"; + sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; }; passthru = { diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 57ba6fd0766f..47e03c0b0707 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -1,29 +1,71 @@ -{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3 -, gobject-introspection, gdk-pixbuf, librsvg, libgweather -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas -, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }: +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, python3 +, pkgconfig +, gnome3 +, gtk3 +, gobject-introspection +, gdk-pixbuf +, librsvg +, libgweather +, geoclue2 +, wrapGAppsHook +, folks +, libchamplain +, gfbgraph +, libsoup +, gsettings-desktop-schemas +, webkitgtk +, gjs +, libgee +, libhandy +, geocode-glib +, evolution-data-server +, gnome-online-accounts +}: -let +stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.36.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ila7li9yi4lyjc84a787qr33wr7ayppphxn451jzg410pfcamhz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1"; }; doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gettext python3 wrapGAppsHook ]; + nativeBuildInputs = [ + gettext + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; + buildInputs = [ + evolution-data-server + folks + gdk-pixbuf + geoclue2 + geocode-glib + gfbgraph + gjs + gnome-online-accounts + gnome3.adwaita-icon-theme gobject-introspection - gtk3 geoclue2 gjs libgee folks gfbgraph - geocode-glib libchamplain libsoup - gdk-pixbuf librsvg libgweather - gsettings-desktop-schemas evolution-data-server - gnome-online-accounts gnome3.adwaita-icon-theme + gsettings-desktop-schemas + gtk3 + libchamplain + libgee + libgweather + libhandy + librsvg + libsoup webkitgtk ]; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 92c40f4a0086..a682e3b4935a 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.36.4.1"; + version = "3.38.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh"; + sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index c32289d70d79..fab4c491a6b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -13,7 +13,7 @@ , evolution-data-server , gnome-online-accounts , libuuid -, libhandy +, libhandy_0 , webkitgtk , zeitgeist , gnome3 @@ -22,16 +22,13 @@ , tracker }: -let - version = "3.36.3"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnome-notes"; - inherit version; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "1midnphyg038s94ahhzv0pvbzzzn62ccky28c9nazxqvw4hvdsbh"; + sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis="; }; doCheck = true; @@ -57,7 +54,7 @@ stdenv.mkDerivation { glib gtk3 libuuid - libhandy + libhandy_0 # doesn't support libhandy-1 yet webkitgtk tracker gnome-online-accounts diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index f4a72fdfb482..6875b2ec814a 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,30 +1,60 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3 -, meson, ninja, python3, desktop-file-utils }: +{ stdenv +, fetchurl +, pkgconfig +, gettext +, gobject-introspection +, wrapGAppsHook +, gjs +, glib +, gtk3 +, gdk-pixbuf +, gst_all_1 +, gnome3 +, meson +, ninja +, python3 +, desktop-file-utils +, libhandy +}: stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.34.0"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9"; + sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk="; }; nativeBuildInputs = [ - pkgconfig gettext meson ninja gobject-introspection - wrapGAppsHook python3 desktop-file-utils + pkgconfig + gettext + meson + ninja + gobject-introspection + wrapGAppsHook + python3 + desktop-file-utils ]; - buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); + + buildInputs = [ + gjs + glib + gtk3 + gdk-pixbuf + libhandy + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad # for gstreamer-player-1.0 + ]); postPatch = '' chmod +x build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py ''; - # TODO: fix this in gstreamer - # TODO: make stdenv.lib.getBin respect outputBin - PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin"; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix index 514eecc17365..c16b1f2ab124 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.36.3"; + version = "3.38.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fpmrvhd40yay051bzn4x3gsrzdv42nav0pm5ps0np8wk1z689jg"; + sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 3668fc171b36..3cbd7a509fe4 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.36.2"; + version = "3.38.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5"; + hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI="; }; doCheck = true; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } |