Merge pull request #60906 from worldofpeace/gnome-updates-staging

GNOME updates staging
This commit is contained in:
worldofpeace 2019-05-07 18:04:30 -04:00 committed by GitHub
commit 163bc2c598
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 84 additions and 26 deletions

View file

@ -8,11 +8,11 @@ let
pname = "tracker-miners";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr";
sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw";
};
nativeBuildInputs = [

View file

@ -6,7 +6,7 @@
let
pname = "tracker";
version = "2.2.1";
version = "2.2.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc";
sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6";
};
nativeBuildInputs = [

View file

@ -1,34 +1,92 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection
, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus, libgee
, telepathy-glib, evolution-data-server, libsecret, db }:
{ fetchurl
, stdenv
, pkgconfig
, meson
, ninja
, glib
, gnome3
, nspr
, gettext
, gobject-introspection
, vala
, sqlite
, libxml2
, dbus-glib
, libsoup
, nss
, dbus
, libgee
, telepathy-glib
, evolution-data-server
, libsecret
, db
, python3
, python
, readline
, gtk3
}:
# TODO: enable more folks backends
stdenv.mkDerivation rec {
pname = "folks";
version = "0.11.4";
version = "0.12.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
sha256 = "0xfl6rnzhdbmw1q26xiq34cdiy7a9karpi2r7wyplnnz1zaz5a9w";
};
propagatedBuildInputs = [ glib libgee sqlite ];
buildInputs = [
dbus-glib telepathy-glib evolution-data-server
libsecret libxml2 libsoup nspr nss db
mesonFlags = [
# TODO: https://gitlab.gnome.org/GNOME/folks/issues/108
"-Ddocs=false"
];
checkInputs = [ dbus ];
nativeBuildInputs = [
gettext
gobject-introspection
gtk3
meson
ninja
pkgconfig
python
python3
vala
];
nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
buildInputs = [
db
dbus-glib
evolution-data-server
libsecret
libsoup
libxml2
nspr
nss
readline
telepathy-glib
];
configureFlags = [ "--disable-fatal-warnings" ];
propagatedBuildInputs = [
glib
libgee
sqlite
];
enableParallelBuilding = true;
checkInputs = [
dbus
];
postBuild = "rm -rf $out/share/gtk-doc";
# TODO: enable tests
# doCheck = true;
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
patchShebangs tests/tools/manager-file.py
'';
passthru = {
updateScript = gnome3.updateScript {
@ -37,11 +95,11 @@ stdenv.mkDerivation rec {
};
};
meta = {
meta = with stdenv.lib; {
description = "A library that aggregates people from multiple sources to create metacontacts";
homepage = https://wiki.gnome.org/Projects/Folks;
license = stdenv.lib.licenses.lgpl2Plus;
license = licenses.lgpl2Plus;
maintainers = gnome3.maintainers;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
};
}

View file

@ -3,14 +3,14 @@
let
pname = "glib-networking";
version = "2.60.1";
version = "2.60.2";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p";
sha256 = "0cl74q7hvq4xqqc88vlzmfw1sh5n9hdh1yvn2v1vg9am1z8z68n0";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs

View file

@ -46,7 +46,7 @@ let
'';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.60.1";
version = "2.60.2";
in
stdenv.mkDerivation rec {
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0q2mkdvp20v6dvrhik8k5j875kj29hcfz346xi0624n6spsq9y49";
sha256 = "1nc0iyday7866hq0hb78h7lxa44an998lzis8jhgvp8a0rsm9w9f";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch