JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #29392: gnome3: 3.24 -> 3.26

Browse Source 
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
This commit is contained in:
Vladimír Čunát 2017-11-27 12:19:01 +01:00
commit 6345089ca0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
151 changed files with 862 additions and 751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

@ -210,6 +210,7 @@
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
./services/desktops/gnome3/tracker-miners.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/telepathy.nix
./services/development/hoogle.nix

41
nixos/modules/services/desktops/gnome3/tracker-miners.nix Normal file
View File

@ -0,0 +1,41 @@
# Tracker Miners daemons.
{ config, pkgs, lib, ... }:
with lib;
{
###### interface
options = {
services.gnome3.tracker-miners = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable Tracker miners, indexing services for Tracker
search engine and metadata storage system.
'';
};
};
};
###### implementation
config = mkIf config.services.gnome3.tracker-miners.enable {
environment.systemPackages = [ pkgs.gnome3.tracker-miners ];
services.dbus.packages = [ pkgs.gnome3.tracker-miners ];
systemd.packages = [ pkgs.gnome3.tracker-miners ];
};
}

1
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -108,6 +108,7 @@ in {
services.gnome3.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true;
services.gnome3.tracker-miners.enable = mkDefault true;
hardware.pulseaudio.enable = mkDefault true;
services.telepathy.enable = mkDefault true;
networking.networkmanager.enable = mkDefault true;

11
pkgs/applications/misc/deepin-terminal/default.nix
View File

@ -1,21 +1,22 @@
{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }:
{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }:
stdenv.mkDerivation rec {
name = "deepin-terminal-${version}";
version = "2.3.3";
version = "2.6.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h";
sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b";
};
patchPhase = ''
substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ];
nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ];
buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ];
meta = {
description = "The default terminal emulation for Deepin";

32
pkgs/desktops/gnome-3/apps/bijiben/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, pkgconfig, glib
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib
, evolution_data_server, evolution, sqlite
, makeWrapper, itstool, desktop_file_utils
, wrapGAppsHook, itstool, desktop_file_utils
, clutter_gtk, libuuid, webkitgtk, zeitgeist
, gnome3, librsvg, gdk_pixbuf, libxml2 }:
@ -8,28 +8,34 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
checkPhase = "meson test";
patches = [
./no-update-icon-cache.patch
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib intltool itstool libxml2
clutter_gtk libuuid webkitgtk gnome3.tracker
gnome3.gnome_online_accounts zeitgeist desktop_file_utils
gnome3.gsettings_desktop_schemas makeWrapper
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook
];
buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker
gnome3.gnome_online_accounts zeitgeist
gnome3.gsettings_desktop_schemas
gdk_pixbuf gnome3.defaultIconTheme librsvg
evolution_data_server evolution sqlite ];
enableParallelBuilding = true;
preFixup = ''
wrapProgram "$out/bin/bijiben" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Bijiben;
description = "Note editor designed to remain simple to use";
broken = true;
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.linux;

22
pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -7,10 +7,6 @@
if not os.environ.get('DESTDIR'):
datadir = sys.argv[1]
- icondir = os.path.join(datadir, 'icons', 'hicolor')
- print('Update icon cache...')
- subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
-
schemadir = os.path.join(datadir, 'glib-2.0', 'schemas')
print('Compile gsettings schemas...')
subprocess.call(['glib-compile-schemas', schemadir])
@@ -18,8 +14,3 @@
desktop_file = os.path.join(datadir, 'applications', 'org.gnome.bijiben.desktop')
print('Validate desktop file...')
subprocess.call(['desktop-file-validate', desktop_file])
-
- if sys.argv[2] == 'update-mimedb':
- mimedir = os.path.join(datadir, 'mime')
- print('Update mime database...')
- subprocess.call(['update-mime-database', mimedir])

6
pkgs/desktops/gnome-3/apps/bijiben/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "bijiben-3.24.1";
name = "bijiben-3.27.1";
src = fetchurl {
url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz;
sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741";
url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz;
sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64";
};
}

2
pkgs/desktops/gnome-3/apps/cheese/default.nix
View File

@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Cheese;
description = "Take photos and videos with your webcam, with fun graphical effects";

6
pkgs/desktops/gnome-3/apps/cheese/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "cheese-3.24.0";
name = "cheese-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz;
sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372";
url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz;
sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605";
};
}

15
pkgs/desktops/gnome-3/apps/evolution/default.nix
View File

@ -1,9 +1,8 @@
{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
{ stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight
, pkgconfig, gtk3, glib, libnotify, gtkspell3
, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap
, cmake}:
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }:
let
majVer = gnome3.version;
@ -15,10 +14,7 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
gnome3.evolution_data_server ];
propagatedBuildInputs = [ gnome3.gtkhtml ];
buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
gnome3.evolution_data_server libsecret libical gcr
webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
@ -26,10 +22,9 @@ in stdenv.mkDerivation rec {
nss nspr libnotify procps highlight gnome3.libgweather
gnome3.gsettings_desktop_schemas
gnome3.libgnome_keyring gnome3.glib_networking openldap
cmake
];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ];
configureFlags = [ "--disable-pst-import" "--disable-autoar"

6
pkgs/desktops/gnome-3/apps/evolution/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-3.24.5";
name = "evolution-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz;
sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189";
url = mirror://gnome/sources/evolution/3.26/evolution-3.26.2.tar.xz;
sha256 = "2d9299b8414903021faa03cbb885814de454f5260398eb2c2a03600224479137";
};
}

6
pkgs/desktops/gnome-3/apps/file-roller/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "file-roller-3.24.1";
name = "file-roller-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz;
sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a";
url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz;
sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5";
};
}

10
pkgs/desktops/gnome-3/apps/glade/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, intltool, fetchurl, python, autoreconfHook
, pkgconfig, gtk3, glib
, makeWrapper, itstool, libxml2, docbook_xsl
, gnome3, librsvg, gdk_pixbuf, libxslt }:
, pkgconfig, gtk3, glib, gobjectIntrospection
, wrapGAppsHook, itstool, libxml2, docbook_xsl
, gnome3, gdk_pixbuf, libxslt }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [
pkgconfig intltool itstool makeWrapper docbook_xsl libxslt
pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection
# reconfiguration
autoreconfHook gnome3.gnome_common gnome3.yelp_tools
];
buildInputs = [ gtk3 glib libxml2 python
gnome3.gsettings_desktop_schemas
gdk_pixbuf gnome3.defaultIconTheme librsvg ];
gdk_pixbuf gnome3.defaultIconTheme ];
enableParallelBuilding = true;

10
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
{ stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
, 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
@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [
makeWrapper pkgconfig intltool
makeWrapper pkgconfig gettext
];
buildInputs = [
itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
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
libcap_ng numactl xen libapparmor
];

6
pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-boxes-3.24.0";
name = "gnome-boxes-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz;
sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49";
url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz;
sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210";
};
}

16
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, intltool, evolution_data_server, sqlite, libxml2, libsoup
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup
, glib, gnome_online_accounts, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
@ -7,13 +7,17 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
buildInputs = [
gtk3 wrapGAppsHook intltool evolution_data_server
sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts
gsettings_desktop_schemas
gtk evolution_data_server libsoup glib gnome_online_accounts
gsettings_desktop_schemas gnome3.defaultIconTheme
];
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/Calendar;
description = "Simple and beautiful calendar application for GNOME";

6
pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-calendar-3.24.3";
name = "gnome-calendar-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz;
sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec";
url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz;
sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e";
};
}

6
pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-characters-3.24.0";
name = "gnome-characters-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz;
sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596";
url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz;
sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b";
};
}

23
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View File

@ -1,23 +1,26 @@
{ stdenv, intltool, fetchurl, libgweather, libnotify
, pkgconfig, gtk3, glib, gsound
, makeWrapper, itstool, libcanberra_gtk3, libtool
, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
{ stdenv, fetchurl
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils
, vala, gtk3, glib, gsound, libcanberra_gtk3
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3
gnome3.gsettings_desktop_schemas makeWrapper
gdk_pixbuf gnome3.defaultIconTheme librsvg
nativeBuildInputs = [ vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils ];
buildInputs = [ gtk3 glib libcanberra_gtk3
gnome3.gsettings_desktop_schemas
gdk_pixbuf gnome3.defaultIconTheme
gnome3.gnome_desktop gnome3.geocode_glib geoclue2
libgweather libnotify libtool gsound
wrapGAppsHook ];
libgweather gsound ];
enableParallelBuilding = true;
prePatch = "patchShebangs build-aux/";
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Clocks;
description = "Clock application designed for GNOME 3";

6
pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-clocks-3.24.0";
name = "gnome-clocks-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz;
sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36";
url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz;
sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7";
};
}

19
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, evince, gjs
, pkgconfig, gtk3, glib
, makeWrapper, itstool, libxslt, webkitgtk
{ stdenv, gettext, fetchurl, evince, gjs
, pkgconfig, gtk3, glib, tracker, tracker-miners
, itstool, libxslt, webkitgtk
, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
, gobjectIntrospection, json_glib, inkscape, poppler_utils
, gmp, desktop_file_utils, wrapGAppsHook }:
@ -12,16 +12,13 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-getting-started" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool itstool libxslt
docbook_xsl desktop_file_utils inkscape poppler_utils
gnome3.gsettings_desktop_schemas makeWrapper gmp
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
gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
gnome3.gnome_desktop gnome3.libzapojit json_glib
wrapGAppsHook ]
++ (with gnome3; [ libgepub ]);
tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts
gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ];
enableParallelBuilding = true;

6
pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-documents-3.24.3";
name = "gnome-documents-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz;
sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0";
url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz;
sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9";
};
}

6
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-getting-started-docs-3.24.1";
name = "gnome-getting-started-docs-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz;
sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97";
url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz;
sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775";
};
}

6
pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-logs-3.24.2";
name = "gnome-logs-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz;
sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4";
url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz;
sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c";
};
}

6
pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-maps-3.24.3";
name = "gnome-maps-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz;
sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6";
url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz;
sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050";
};
}

4
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners
, libxml2, python3Packages, libnotify, wrapGAppsHook
, pkgconfig, gtk3, glib, cairo
, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
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 ];
gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ];
wrapPrefixVariables = [ "PYTHONPATH" ];

6
pkgs/desktops/gnome-3/apps/gnome-music/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-music-3.24.2";
name = "gnome-music-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz;
sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c";
url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz;
sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3";
};
}

4
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, exempi, libxml2
, pkgconfig, gtk3, glib
, 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
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
gnome3.gnome_online_accounts gnome3.gnome_desktop
lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils
wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ];
enableParallelBuilding = true;

6
pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-photos-3.24.3";
name = "gnome-photos-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz;
sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288";
url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.2.tar.xz;
sha256 = "9001ed2794da44522a1d700c7b5aff40ede92f80ba17031f0dfa7f54d6d05657";
};
}

6
pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-weather-3.24.0";
name = "gnome-weather-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz;
sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574";
url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz;
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
};
}

20
pkgs/desktops/gnome-3/apps/polari/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy_glib, gjs, itstool, telepathy_idle, libxml2
, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme
, telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils
, pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
, gnome3, wrapGAppsHook, telepathy_logger, gspell }:
stdenv.mkDerivation rec {
@ -8,9 +8,17 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
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 ];
patches = [
(fetchpatch {
url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff;
sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9";
})
];
enableParallelBuilding = true;

6
pkgs/desktops/gnome-3/apps/polari/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "polari-3.24.2";
name = "polari-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz;
sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42";
url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz;
sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190";
};
}

4
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, intltool, fetchurl, vala_0_32
{ stdenv, intltool, fetchurl, vala
, pkgconfig, gtk3, glib
, wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, librsvg, gdk_pixbuf, gpgme
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
libsecret avahi libsoup p11_kit vala_0_32
libsecret avahi libsoup p11_kit vala
openssh ];
preFixup = ''

6
pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "adwaita-icon-theme-3.24.0";
name = "adwaita-icon-theme-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz;
sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a";
url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.0.tar.xz;
sha256 = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212";
};
}

6
pkgs/desktops/gnome-3/core/baobab/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "baobab-3.24.0";
name = "baobab-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz;
sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f";
url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz;
sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e";
};
}

12
pkgs/desktops/gnome-3/core/caribou/default.nix
View File

@ -1,8 +1,10 @@
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }:
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook
, wrapGAppsHook }:
let
majorVersion = "0.4";
pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
in
stdenv.mkDerivation rec {
name = "caribou-${majorVersion}.21";
@ -12,11 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ];
buildInputs = with gnome3;
[ glib gtk clutter at_spi2_core dbus pythonPackages.python
pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
[ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3
libXtst gtk2 ];
propagatedBuildInputs = [ gnome3.libgee libxklavier ];

4
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas
intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];

6
pkgs/desktops/gnome-3/core/dconf-editor/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "dconf-editor-3.22.0";
name = "dconf-editor-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz;
sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f";
url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz;
sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1";
};
}

6
pkgs/desktops/gnome-3/core/eog/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
{ fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3
, shared_mime_info, wrapGAppsHook, librsvg, libexif }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
buildInputs = with gnome3;
[ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg
[ libxml2 libjpeg gtk glib libpeas librsvg
gsettings_desktop_schemas shared_mime_info adwaita-icon-theme
gnome_desktop libexif dconf ];

6
pkgs/desktops/gnome-3/core/eog/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "eog-3.24.1";
name = "eog-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz;
sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7";
url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz;
sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad";
};
}

36
pkgs/desktops/gnome-3/core/epiphany/default.nix
View File

@ -1,32 +1,40 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:
, sqlite, gcr, isocodes, desktop_file_utils, file
, gdk_pixbuf, gnome_common, gst_all_1, json_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# Tests need an X display
configureFlags = [ "--disable-static --disable-tests" ];
mesonFlags = [ "-Dunit_tests=false" ];
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ];
buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file
webkitgtk libsoup libsecret gnome_desktop libnotify libtool
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify
sqlite isocodes p11_kit icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr
glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav json_glib ];
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
postPatch = ''
chmod +x post_install.py # patchShebangs requires executable file
patchShebangs post_install.py
'';
postFixup = ''
# Patched meson does not add internal libraries to rpath
for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do
patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f"
done
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Epiphany;
description = "WebKit based web browser for GNOME";

6
pkgs/desktops/gnome-3/core/epiphany/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "epiphany-3.24.3";
name = "epiphany-3.26.3";
src = fetchurl {
url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz;
sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154";
url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.3.tar.xz;
sha256 = "cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5";
};
}

6
pkgs/desktops/gnome-3/core/evince/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evince-3.24.1";
name = "evince-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz;
sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37";
url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz;
sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8";
};
}

15
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -1,17 +1,18 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf
, intltool, libsoup, libxml2, libsecret, icu, sqlite
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,
vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true
, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ];
buildInputs = with gnome3;
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
(stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper
icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk
libaccounts-glib ]
++ stdenv.lib.optional valaSupport vala_0_32;
[ glib libsoup libxml2 gtk gnome_online_accounts
(stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata
icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk
libaccounts-glib json_glib ]
++ stdenv.lib.optional valaSupport vala;
propagatedBuildInputs = [ libsecret nss nspr libical db ];

6
pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-data-server-3.24.5";
name = "evolution-data-server-3.26.2.1";
src = fetchurl {
url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz;
sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1";
url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.2.1.tar.xz;
sha256 = "09fb1c4ce20c62309e8ea2d80649f590492e88c1deb89118e715e155296baefd";
};
}

4
pkgs/desktops/gnome-3/core/folks/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
, telepathy_glib, evolution_data_server, libsecret, db }:
# TODO: enable more folks backends
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
# dbus_daemon needed for tests
buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ];
vala libsecret libxml2 libsoup nspr nss intltool db ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-fatal-warnings";

7
pkgs/desktops/gnome-3/core/gcr/default.nix
View File

@ -1,19 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }:
, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection libxslt makeWrapper vala ];
buildInputs = let
gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
in [
intltool gpg gobjectIntrospection libxslt
libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32
gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk
];
propagatedBuildInputs = [ glib gtk p11_kit ];

19
pkgs/desktops/gnome-3/core/gdm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth
, librsvg }:
, librsvg, coreutils }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -11,17 +11,21 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
'';
postPatch = ''
substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth"
substituteInPlace data/gdm.service.in --replace "/bin/kill" "${coreutils}/bin/kill"
'';
configureFlags = [ "--sysconfdir=/etc"
"--localstatedir=/var"
"--with-plymouth=yes"
"--with-initial-vt=7"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ glib itstool libxml2 intltool
accountsservice gnome3.dconf systemd
nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];
buildInputs = [ glib accountsservice systemd
gobjectIntrospection libX11 gtk
libcanberra_gtk3 pam libtool plymouth librsvg ];
libcanberra_gtk3 pam plymouth librsvg ];
enableParallelBuilding = true;
@ -31,6 +35,11 @@ stdenv.mkDerivation rec {
./gdm-session-worker_xserver-path.patch
];
postInstall = ''
# Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary”
rm $out/share/gdm/greeter/autostart/orca-autostart.desktop
'';
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
meta = with stdenv.lib; {

19
pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
View File

@ -1,19 +0,0 @@
diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c
index d835b34..86f0d47 100644
--- a/daemon/gdm-x-session.c.orig
+++ b/daemon/gdm-x-session.c
@@ -240,7 +240,13 @@ spawn_x_server (State *state,
display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- g_ptr_array_add (arguments, X_SERVER);
+ if (g_getenv ("GDM_X_SERVER") != NULL) {
+ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER"));
+ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER"));
+ } else {
+ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER);
+ g_ptr_array_add (arguments, X_SERVER);
+ }
if (vt_string != NULL) {
g_ptr_array_add (arguments, vt_string);

6
pkgs/desktops/gnome-3/core/gdm/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gdm-3.24.2";
name = "gdm-3.26.2.1";
src = fetchurl {
url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz;
sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8";
url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz;
sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
};
}

9
pkgs/desktops/gnome-3/core/gjs/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
, spidermonkey_52, pango, readline, glib, libxml2, dbus }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -7,12 +7,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
propagatedBuildInputs = [ spidermonkey_38 ];
# GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
preConfigure = ''
sed -i s/mozjs-38/js/ configure
'';
propagatedBuildInputs = [ spidermonkey_52 ];
postInstall = ''
sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la

6
pkgs/desktops/gnome-3/core/gjs/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gjs-1.48.6";
name = "gjs-1.50.2";
src = fetchurl {
url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz;
sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3";
};
}

6
pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-backgrounds-3.24.0";
name = "gnome-backgrounds-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz;
sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca";
url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz;
sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f";
};
}

17
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
View File

@ -1,17 +1,16 @@
{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib
, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }:
{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
makeWrapper gnome3.gsettings_desktop_schemas itstool
libnotify libcanberra_gtk3 ];
nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ];
buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ];
preFixup = ''
wrapProgram "$out/bin/bluetooth-sendto" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
meta = with stdenv.lib; {

6
pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-bluetooth-3.20.1";
name = "gnome-bluetooth-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz;
sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a";
url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz;
sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f";
};
}

6
pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-calculator-3.24.0";
name = "gnome-calculator-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz;
sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10";
url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz;
sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7";
};
}

11
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View File

@ -3,7 +3,7 @@
, libchamplain, clutter_gtk, geocode_glib
, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
, libsoup, vala_0_32, dbus_glib, automake, autoconf }:
, libsoup, vala, dbus_glib, automake, autoconf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -17,14 +17,11 @@ stdenv.mkDerivation rec {
touch src/*.vala
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool itstool evolution_data_server
gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ];
buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify
folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
libxml2 libsoup gnome3.gnome_online_accounts nspr nss
gdk_pixbuf gnome3.defaultIconTheme librsvg
libchamplain clutter_gtk geocode_glib
vala_0_32 automake autoconf db ];
gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ];
preFixup = ''
gappsWrapperArgs+=(

6
pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-contacts-3.22.1";
name = "gnome-contacts-3.26";
src = fetchurl {
url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz;
sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b";
url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz;
sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1";
};
}

6
pkgs/desktops/gnome-3/core/gnome-control-center/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-control-center-3.24.3";
name = "gnome-control-center-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz;
sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2";
url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz;
sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5";
};
}

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
, gobjectIntrospection }:
, libseccomp, gobjectIntrospection }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ python libxml2Python libxslt which libX11
xkeyboard_config isocodes itstool wayland
gtk3 glib intltool gnome_doc_utils libxkbfile
gobjectIntrospection ];
libseccomp gobjectIntrospection ];
propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];

6
pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-desktop-3.24.2";
name = "gnome-desktop-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz;
sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e";
url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz;
sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a";
};
}

23
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View File

@ -1,27 +1,20 @@
{ stdenv, intltool, fetchurl
, pkgconfig, gtk3, glib
, bash, makeWrapper, itstool, libxml2
, gnome3, librsvg, gdk_pixbuf, file }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
, gnome3, gtk, glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
propagatedBuildInputs = [ gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool itstool libxml2 file
gnome3.gsettings_desktop_schemas makeWrapper ];
nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];
buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ];
preFixup = ''
wrapProgram "$out/bin/gnome-dictionary" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Dictionary;

6
pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-dictionary-3.24.0";
name = "gnome-dictionary-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz;
sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2";
url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz;
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
};
}

29
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View File

@ -1,24 +1,23 @@
{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
, itstool, gnome3, gdk_pixbuf, libxml2, python
, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk, glib, wrapGAppsHook, libnotify
, itstool, gnome3, gdk_pixbuf, libxml2
, libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bash gtk3 glib intltool itstool
libxslt libtool libsecret libpwquality cracklib
libnotify libdvdread libcanberra_gtk3 docbook_xsl
gdk_pixbuf gnome3.defaultIconTheme
udisks2 gnome3.gnome_settings_daemon
gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl
wrapGAppsHook libxml2 ];
buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3
gdk_pixbuf udisks2 gnome3.defaultIconTheme
gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ];
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Disks;

6
pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-disk-utility-3.24.1";
name = "gnome-disk-utility-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz;
sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2";
};
}

24
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
View File

@ -1,27 +1,19 @@
{ stdenv, intltool, fetchurl
, pkgconfig, gtk3, glib
, bash, wrapGAppsHook, itstool
, gnome3, librsvg, gdk_pixbuf }:
{ stdenv, meson, ninja, gettext, fetchurl
, pkgconfig, gtk3, glib, libxml2
, wrapGAppsHook, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
checkPhase = "meson test";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop
gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gsettings_desktop_schemas wrapGAppsHook ];
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
)
'';
# Do not run meson-postinstall.sh
preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
meta = with stdenv.lib; {
description = "Program that can preview fonts and create thumbnails for fonts";

6
pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-font-viewer-3.24.0";
name = "gnome-font-viewer-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz;
sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76";
url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz;
sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0";
};
}

6
pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-keyring-3.20.0";
name = "gnome-keyring-3.20.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz;
sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99";
url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz;
sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp";
};
}

6
pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-online-accounts-3.24.2";
name = "gnome-online-accounts-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz;
sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba";
url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.1.tar.xz;
sha256 = "603c110405cb89a01497a69967f10e3f3f36add3dc175b062ec4c5ed4485621b";
};
}

13
pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
View File

@ -1,25 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
, libsoup, json_glib, gmp, openssl, dleyna-server, makeWrapper }:
, libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
gnome3.gnome_online_accounts gnome3.libmediaart
gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest
dleyna-server ];
enableParallelBuilding = true;
preFixup = ''
for f in $out/libexec/*; do
wrapProgram "$f" \
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}"
done
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
description = "A set of crawlers that go through your online content and index them locally in Tracker";

6
pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-online-miners-3.24.0";
name = "gnome-online-miners-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz;
sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab";
url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz;
sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e";
};
}

28
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View File

@ -1,26 +1,30 @@
{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
, bash, gtk3, glib, wrapGAppsHook
, itstool, gnome3, librsvg, gdk_pixbuf }:
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3
, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib
, gnome3, librsvg, gdk_pixbuf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
checkPhase = "meson test";
postPatch = ''
chmod +x build-aux/postinstall.py # patchShebangs requires executable file
patchShebangs build-aux/postinstall.py
'';
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3
gnome3.gsettings_desktop_schemas wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ];
buildInputs = [ bash gtk3 glib libcanberra_gtk3
gnome3.gsettings_desktop_schemas ];
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"
)
'';
patches = [
./prevent-cache-updates.patch
];
meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;

21
pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/build-aux/postinstall.py
+++ b/build-aux/postinstall.py
@@ -8,18 +8,6 @@
# Packaging tools define DESTDIR and this isn't needed for them
if 'DESTDIR' not in os.environ:
- print('Updating icon cache...')
- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
- if not os.path.exists(icon_cache_dir):
- os.makedirs(icon_cache_dir)
- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
-
- print('Updating desktop database...')
- desktop_database_dir = os.path.join(datadir, 'applications')
- if not os.path.exists(desktop_database_dir):
- os.makedirs(desktop_database_dir)
- subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
-
print('Compiling GSettings schemas...')
schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas')
if not os.path.exists(schemas_dir):

6
pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-screenshot-3.22.0";
name = "gnome-screenshot-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz;
sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230";
url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz;
sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
};
}

6
pkgs/desktops/gnome-3/core/gnome-session/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-session-3.24.1";
name = "gnome-session-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz;
sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee";
url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz;
sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708";
};
}

6
pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-settings-daemon-3.24.3";
name = "gnome-settings-daemon-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz;
sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593";
url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz;
sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4";
};
}

6
pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-shell-extensions-3.24.3";
name = "gnome-shell-extensions-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz;
sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79";
url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz;
sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6";
};
}

64
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -1,9 +1,10 @@
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
{ fetchurl, fetchpatch, 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
, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2
, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales
, sqlite, 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 }:
# 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
@ -14,50 +15,55 @@ in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# Needed to find /etc/NetworkManager/VPN
configureFlags = [ "--sysconfdir=/etc" ];
mesonFlags = [ "--sysconfdir=/etc" ];
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 intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf
libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf
(librsvg.override { enableIntrospection = true; })
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
clutter networkmanager libstartup_notification telepathy_glib
libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
libical libtool nss gtk gstreamer makeWrapper gdm
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) ];
propagatedUserEnvPkgs = [
# Needed to support on-screen keyboard used with touch screen devices
# see https://github.com/NixOS/nixpkgs/issues/25968
gnome3.caribou
];
installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
patches = [
(fetchpatch {
name = "0001-build-Add-missing-dependency-to-run-js-test.patch";
url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016;
sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm";
})
./fix-paths.patch
];
preBuild = ''
postPatch = ''
patchShebangs src/data-to-c.pl
substituteInPlace data/Makefile --replace " install-keysDATA" ""
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
'';
preFixup = with gnome3; ''
wrapProgram "$out/bin/gnome-shell" \
--prefix PATH : "${unzip}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/bin/gnome-shell-extension-prefs" \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
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
'';
enableParallelBuilding = true;

18
pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch Normal file
View File

@ -0,0 +1,18 @@
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')

6
pkgs/desktops/gnome-3/core/gnome-shell/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-shell-3.24.3";
name = "gnome-shell-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz;
sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8";
url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz;
sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c";
};
}

30
pkgs/desktops/gnome-3/core/gnome-software/default.nix
View File

@ -1,17 +1,33 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
, json_glib, libsecret, valgrind-light }:
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
, glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt
, json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42
valgrind-light docbook_xsl gtk_doc desktop_file_utils ];
buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
gtkspell3 json_glib libsecret
polkit attr acl libyaml valgrind-light ];
gtkspell3 json_glib libsecret ostree
polkit attr acl libyaml ];
propagatedBuildInputs = [ isocodes ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
postPatch = ''
patchShebangs meson_post_install.sh
'';
mesonFlags = [
"-Denable-flatpak=false"
"-Denable-rpm=false"
"-Denable-fwupd=false"
"-Denable-oauth=false"
"-Denable-ubuntu-reviews=false"
"-Denable-gudev=false"
];
postInstall = ''
mkdir -p $out/share/xml/
ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes

6
pkgs/desktops/gnome-3/core/gnome-software/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-software-3.24.3";
name = "gnome-software-3.26.3";
src = fetchurl {
url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz;
sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3";
url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz;
sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48";
};
}

6
pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-system-monitor-3.24.0";
name = "gnome-system-monitor-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz;
sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4";
url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz;
sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3";
};
}

8
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3
, gnome_doc_utils, intltool, which, libuuid, vala
, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
gnome3.dconf itstool gnome3.nautilus vala_0_32 ];
gnome3.dconf itstool gnome3.nautilus ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
desktop_file_utils wrapGAppsHook ];
vala desktop_file_utils wrapGAppsHook ];
# Silly ./configure, it looks for dbus file from gnome-shell in the
# installation tree of the package it is configuring.

6
pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-terminal-3.24.2";
name = "gnome-terminal-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz;
sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f";
url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz;
sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0";
};
}

6
pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-user-docs-3.24.2";
name = "gnome-user-docs-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz;
sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f";
url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.tar.xz;
sha256 = "e7d7f0434624ef6f21803c798d8672331f065485bdf59d44ac5b6b5f14fa1b78";
};
}

8
pkgs/desktops/gnome-3/core/gsound/default.nix
View File

@ -3,15 +3,15 @@
let
majVer = "1.0";
in stdenv.mkDerivation rec {
name = "gsound-${majVer}.1";
name = "gsound-${majVer}.2";
src = fetchurl {
url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ];
nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ];
buildInputs = [ glib libcanberra_gtk2 ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GSound;

2
pkgs/desktops/gnome-3/core/libgee/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./fix_introspection_paths.patch ];
nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
buildInputs = [ glib ];
meta = with stdenv.lib; {

15
pkgs/desktops/gnome-3/core/libgepub/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3
, webkitgtk, libsoup, libxml2, libarchive }:
stdenv.mkDerivation rec {
name = "libgepub-${version}";
version = "0.4";
name = "libgepub-${version}.2";
version = "0.5";
src = fetchurl {
url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz";
sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4";
sha256 = "0f1bczy3b00kj7mhm80xgpcgibh8h0pgcr46l4wifi45jacji0w4";
};
doCheck = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup
libxml2 libarchive ];
checkPhase = "meson test";
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];
meta = with stdenv.lib; {
description = "GObject based library for handling and rendering epub documents";

6
pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "libgnomekbd-3.22.0.1";
name = "libgnomekbd-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz;
sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de";
url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz;
sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
};
}

9
pkgs/desktops/gnome-3/core/libgweather/default.nix
View File

@ -4,9 +4,14 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ];
propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkgconfig intltool gnome3.vala ];
# Prevent building vapi into ${vala} derivation directory
prePatch = ''
substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
'';
meta = with stdenv.lib; {
platforms = platforms.linux;

6
pkgs/desktops/gnome-3/core/libgweather/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "libgweather-3.24.1";
name = "libgweather-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz;
sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c";
url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz;
sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e";
};
}

11
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
, libgudev, libwacom, xwayland, autoreconfHook }:
@ -35,15 +35,6 @@ stdenv.mkDerivation rec {
libcanberra_gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon ];
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=760670
(fetchpatch {
name = "libgudev-232.patch";
url = https://bugzilla.gnome.org/attachment.cgi?id=358904;
sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";
})
];
preFixup = ''
wrapProgram "$out/bin/mutter" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

6
pkgs/desktops/gnome-3/core/mutter/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "mutter-3.24.4";
name = "mutter-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz;
sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea";
url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz;
sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab";
};
}

18
pkgs/desktops/gnome-3/core/nautilus/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib
, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }:
{ 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 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ];
buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
gnome3.gnome_desktop gnome3.adwaita-icon-theme
gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ];
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 ];
propagatedBuildInputs = [ gnome-autoar ];
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
# hardeningDisable = [ "format" ];
enableParallelBuilding = true;
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
'';
patches = [ ./extension_dir.patch ];
meta = with stdenv.lib; {

6
pkgs/desktops/gnome-3/core/nautilus/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "nautilus-3.24.2.1";
name = "nautilus-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz;
sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3";
url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz;
sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4";
};
}

22
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View File

@ -1,24 +1,20 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
, libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook
, gnome3 }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook
, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
, libxml2, sane-backends, vala, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ];
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
gtk libwebp packagekit sane-backends vala ];
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ];
configureFlags = [ "--disable-packagekit" ];
postPatch = ''
patchShebangs data/meson_compile_gschema.py
patchPhase = ''
sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in
'';
preBuild = ''
# Clean up stale .c files referencing packagekit headers as of 3.20.0:
make clean
'';
postInstall = ''
mkdir -p $out/share/icons
mv $out/share/simple-scan/icons/* $out/share/icons/
@ -39,6 +35,8 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
meta = with stdenv.lib; {
description = "Simple scanning utility";
longDescription = ''

6
pkgs/desktops/gnome-3/core/simple-scan/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "simple-scan-3.22.0.1";
name = "simple-scan-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz;
sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50";
url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz;
sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212";
};
}

4
pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig file intltool ];
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
buildInputs = [ gmime libxml2 libsoup ];
meta = with stdenv.lib; {

6
pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "totem-pl-parser-3.10.2";
name = "totem-pl-parser-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz;
sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz;
sha256 = "1jzvq7s6qdsdpbc58jpcwvyj7qsq58r65kmnbknjzd79j4rsalzi";
};
}

Some files were not shown because too many files have changed in this diff Show More