diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/desktops/gnome-3/apps | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/apps')
27 files changed, 215 insertions, 103 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 41b40244f57d..f068d1994ec4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.34.4"; + version = "3.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1"; + sha256 = "1iwi7mnayw1f90s439flh0zkgmj4qx10dzgj38nd5f3wvqmhabk3"; }; nativeBuildInputs = [ @@ -64,9 +64,9 @@ }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Accerciser; + homepage = "https://wiki.gnome.org/Apps/Accerciser"; description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix index b3bb1e1093c9..05a1cdbc088e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Cheese; + homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix index 60c7fc3872bf..c1901110b585 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "136vpaq94ymyn8pf3a3z1w45xlk1xbvwjdnzasq0d7iwbac0jwks"; + sha256 = "1f3cwc05gw75yqficcxns95r96lv7an4aih6d7hng3n3pqfwyfl7"; }; nativeBuildInputs = [ @@ -125,9 +125,9 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; + homepage = "https://wiki.gnome.org/Apps/Evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 57c7a93a5337..1243d5fa5cb6 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.32.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv"; + sha256 = "0p22jxcagamvp08xfglz4cz1sp8w4p101npw0ggrkhh7vm8yb9bh"; }; LANG = "en_US.UTF-8"; # postinstall.py @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; + homepage = "https://wiki.gnome.org/Apps/FileRoller"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix index 6ea04910d230..c6b28e86ab83 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,20 +1,21 @@ { stdenv, meson, fetchurl, python3 , pkgconfig, gtk3, glib, adwaita-icon-theme , libpeas, gtksourceview4, gsettings-desktop-schemas -, wrapGAppsHook, ninja, libsoup, libxml2 -, gnome3, gspell, perl, itstool, desktop-file-utils }: +, wrapGAppsHook, ninja, libsoup, tepl +, gnome3, gspell, perl, itstool, desktop-file-utils +}: stdenv.mkDerivation rec { pname = "gedit"; - version = "3.34.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb"; + sha256 = "11z3lhc5i3z0gqw0qmprsm4rmvhbbm4gz6wy0f73c73x4bd8xhvd"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook meson ninja libxml2 + pkgconfig wrapGAppsHook meson ninja python3 perl itstool desktop-file-utils ]; @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme libsoup libpeas gtksourceview4 gsettings-desktop-schemas gspell + tepl ]; postPatch = '' @@ -43,10 +45,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; + homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix index 0998dbd069db..7de5ffc1add0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -75,10 +75,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Ghex; + homepage = "https://wiki.gnome.org/Apps/Ghex"; description = "Hex editor for GNOME desktop environment"; platforms = platforms.unix; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix index 367bcdef4723..23f5410e1eaa 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobject-introspection + pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 628442c30753..7432e8e96ed2 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Books; + homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 4b76679f9eee..3d6832316cdc 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -34,7 +34,7 @@ , mtools , cdrkit , libcdio -, libusb +, libusb1 , libarchive , acl , libgudev @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.34.4"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bqrl36nngbd8jpj31ipnywg2k0rg2j3bcgnyvn8r86ysh1gnm0f"; + sha256 = "01hjlz9hljk2skrwfqxpy3934wjs6figs71sw8bm8g2vnyaqwq7a"; }; doCheck = true; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { librsvg libsecret libsoup - libusb + libusb1 libvirt libvirt-glib libxml2 @@ -133,9 +133,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/Apps/Boxes; + homepage = "https://wiki.gnome.org/Apps/Boxes"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index b00045cf9e9e..213b4f616721 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,16 +1,16 @@ { 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 }: +, glib, gnome-online-accounts, gsettings-desktop-schemas, libhandy }: let pname = "gnome-calendar"; - version = "3.34.2"; + version = "3.36.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1bnmd191044zn2kr6f5vg7sm5q59qf7z652awll1f7s6ahijr8rw"; + sha256 = "1cxy4qf83s8w1ys94rcc4ksf7ywi0hkkpfs0szkkip2v8g3j6kq2"; }; passthru = { @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { 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 + gsettings-desktop-schemas gnome3.adwaita-icon-theme libhandy ]; postPatch = '' @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calendar; + homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index fa9a7b003c3c..987fa594ae52 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index a99e775b26b5..7494d66cc0d9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,16 +1,37 @@ -{ stdenv, fetchurl -, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils -, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop -, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib -, gnome3, gdk-pixbuf, geoclue2, libgweather }: +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, pkgconfig +, wrapGAppsHook +, itstool +, desktop-file-utils +, vala +, gobject-introspection +, libxml2 +, gtk3 +, glib +, gsound +, sound-theme-freedesktop +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +, geocode-glib +, gnome3 +, gdk-pixbuf +, geoclue2 +, libgweather +, libhandy +}: stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1"; + sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; }; passthru = { @@ -23,12 +44,29 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2 + vala + meson + ninja + pkgconfig + gettext + itstool + wrapGAppsHook + desktop-file-utils + libxml2 gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib gsettings-desktop-schemas gdk-pixbuf adwaita-icon-theme - gnome-desktop geocode-glib geoclue2 libgweather gsound + gtk3 + glib + gsettings-desktop-schemas + gdk-pixbuf + adwaita-icon-theme + gnome-desktop + geocode-glib + geoclue2 + libgweather + gsound + libhandy ]; preFixup = '' @@ -39,9 +77,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; + homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 5aa39e09cd6f..8d5501537a0f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index f5261011d113..5d31a42301e4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/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.34.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00in6yc02pdalyx8g0fncmch0l7nr819587ngjm83ara9qa8z6fa"; + sha256 = "09bf9r6brmll14z87ljgivw0nr0nggcgjpbx6lg2835zq36vfmi9"; }; passthru = { @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; meta = with stdenv.lib; { - homepage = https://live.gnome.org/DocumentationProject; + homepage = "https://live.gnome.org/DocumentationProject"; description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c80238740e54..7eda4a706cab 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Logs; + homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 784b0142f468..b00c6f5dd4eb 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.34.3"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p58il8dqj96nlv41gf926y8nw6ya15vmv9yr52025sizxaqzydw"; + sha256 = "1yajq2pxd4fbzngwhn92h55rn02psxih8bbdcdxgg66qdbcyychs"; }; doCheck = true; @@ -48,9 +48,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Maps; + homepage = "https://wiki.gnome.org/Apps/Maps"; description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 26c46b1f7b9f..9de452404ce0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -16,6 +16,7 @@ , grilo-plugins , pkgconfig , gtk3 +, pango , glib , desktop-file-utils , appstream-glib @@ -29,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.34.4"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6"; + sha256 = "0cn33r9v2raizq1b8s7s0kb506y91iarc0knm0sljcsqs4qgd03v"; }; nativeBuildInputs = [ @@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 + pango glib libmediaart gnome-online-accounts @@ -101,7 +103,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Music"; description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 37401af3ce60..88072912b663 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 7137ec7180e3..03edd5c9bfe9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,18 +1,37 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig -, wrapGAppsHook, itstool, desktop-file-utils, python3 -, glib, gtk3, evolution-data-server, gnome-online-accounts -, libuuid, webkitgtk, zeitgeist -, gnome3, libxml2, gsettings-desktop-schemas, tracker }: +{ stdenv +, meson +, ninja +, gettext +, fetchurl +, pkgconfig +, wrapGAppsHook +, itstool +, desktop-file-utils +, python3 +, glib +, gtk3 +, evolution-data-server +, gnome-online-accounts +, libuuid +, libhandy +, webkitgtk +, zeitgeist +, gnome3 +, libxml2 +, gsettings-desktop-schemas +, tracker +}: let - version = "3.34.2"; -in stdenv.mkDerivation { + version = "3.36.1"; +in +stdenv.mkDerivation { pname = "gnome-notes"; inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "0kmhivgamnv2kk5kywrwm4af4s7663rjwh2wdri8iy1n2gmc9qpv"; + sha256 = "0421g9czdahk2w2kv7zg4gd9b4q8g1hl483jsfrxy5y7saincbr1"; }; doCheck = true; @@ -23,12 +42,26 @@ in stdenv.mkDerivation { ''; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils python3 wrapGAppsHook + meson + ninja + pkgconfig + gettext + itstool + libxml2 + desktop-file-utils + python3 + wrapGAppsHook ]; buildInputs = [ - glib gtk3 libuuid webkitgtk tracker - gnome-online-accounts zeitgeist + glib + gtk3 + libuuid + libhandy + webkitgtk + tracker + gnome-online-accounts + zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme @@ -48,9 +81,9 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Note editor designed to remain simple to use"; - homepage = https://wiki.gnome.org/Apps/Notes; + homepage = "https://wiki.gnome.org/Apps/Notes"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index fd47f54eb899..4a92052763ef 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -51,9 +51,9 @@ in stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://projects-old.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; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 3996a2e7564a..f4a72fdfb482 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple and modern sound recorder"; - homepage = https://wiki.gnome.org/Apps/SoundRecorder; + homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index f5c4eedc48d5..d837ce3968e4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal task manager for GNOME"; - homepage = https://wiki.gnome.org/Apps/Todo; + homepage = "https://wiki.gnome.org/Apps/Todo"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index c71baa146d1a..407f25165327 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4"; + sha256 = "15ahfgqj0rz16y2bdxb7sa4b3b3larg8hn3b41pc5ddnwf9x63zi"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Weather; + homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix index 02b476c2eea1..394ee86d15a7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,19 +1,26 @@ { stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib +, pkgconfig, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; - version = "3.34.1"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wcfkib673fpys7hcpi5cqc0zgqzqmqvpzjzx4wwmim8lb121x5w"; + sha256 = "1rmmq74g22qrmsg0mjvpzk5403kkpfw0iznvnwxfqbi0dfkamhn4"; }; + patches = [ + # Upstream runs the thumbnailer by passing it to gjs. + # If we wrap it in a shell script, gjs can no longer run it. + # Let’s change the code to run the script directly by making it executable and having gjs in shebang. + ./make-thumbnailer-wrappable.patch + ]; + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ @@ -23,9 +30,13 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib adwaita-icon-theme gsettings-desktop-schemas - telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup + telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk ]; + postFixup = '' + wrapGApp "$out/share/polari/thumbnailer.js" + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -34,9 +45,9 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Polari; + homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch new file mode 100644 index 000000000000..0fb09eb154af --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch @@ -0,0 +1,24 @@ +diff --git a/src/thumbnailer.js b/src/thumbnailer.js +old mode 100644 +new mode 100755 +index e2ad0a5..7ebf08a +--- a/src/thumbnailer.js ++++ b/src/thumbnailer.js +@@ -1,3 +1,4 @@ ++#!/usr/bin/env gjs + imports.gi.versions.Gdk = '3.0'; + imports.gi.versions.Gtk = '3.0'; + +diff --git a/src/urlPreview.js b/src/urlPreview.js +index f17e0be..ccffc32 100644 +--- a/src/urlPreview.js ++++ b/src/urlPreview.js +@@ -44,7 +44,7 @@ class Thumbnailer { + _generateThumbnail(data) { + let { filename, uri } = data; + this._subProc = Gio.Subprocess.new( +- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], ++ [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], + Gio.SubprocessFlags.NONE); + this._subProc.wait_async(null, (o, res) => { + try { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 315968fde651..ec6791e32311 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -22,15 +22,16 @@ , p11-kit , openssh , gsettings-desktop-schemas +, libhandy }: stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.34.1"; + version = "3.36"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19c2zylwgycb5q9hal8rmflc2sywc5c2grpsfsq3rf37i9lfwynw"; + sha256 = "1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr"; }; doCheck = true; @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { openssh openldap libpwquality + libhandy ]; postPatch = '' @@ -74,9 +76,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; + homepage = "https://wiki.gnome.org/Apps/Seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix index c5377157ef0c..e04238b4b16f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote desktop viewer for GNOME"; - homepage = https://wiki.gnome.org/Apps/Vinagre; + homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } |