3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #51889 from jtojnar/gnome-3.30.3

Gnome 3.30.3
This commit is contained in:
Jan Tojnar 2018-12-12 21:27:28 +01:00 committed by GitHub
commit 25ab74f853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 38 additions and 39 deletions

View file

@ -5,13 +5,13 @@
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
let
version = "3.30.2";
version = "3.30.3";
in stdenv.mkDerivation rec {
name = "evolution-${version}";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1ps49js0110lrvg5xiylj9ky0ndp43wrnm0l6p6phmhx4h4477mj";
sha256 = "1v0bqqwv34j8qamby7dwgnha50fpjs8mhlq0h6c35jxsqb2f3k66";
};
propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];

View file

@ -5,13 +5,13 @@
let
pname = "gnome-maps";
version = "3.30.2.1";
version = "3.30.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57";
sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq";
};
doCheck = true;

View file

@ -4,15 +4,13 @@
, gnome3, gpgme, python3, openldap
, libsecret, avahi, p11-kit, openssh }:
let
stdenv.mkDerivation rec {
pname = "seahorse";
version = "3.30";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.30.1.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy";
};
doCheck = true;

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
version = "3.30.2";
version = "3.30.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv";
sha256 = "1q1wpsc3p6b1cacwgkgqbni7rdx3skvb2fm6fyjs2wjgq6zi5753";
};
patches = [

View file

@ -5,13 +5,13 @@
, vala, meson, ninja }:
let
version = "3.30.1";
version = "3.30.2";
in stdenv.mkDerivation rec {
name = "gnome-contacts-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1vizpjb3ll7pndxpvwjjplgdn6b2wf0mjqr9fga0p2cj57v00m89";
sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h";
};
propagatedUserEnvPkgs = [ evolution-data-server ];

View file

@ -4,13 +4,13 @@
let
pname = "nautilus";
version = "3.30.4";
version = "3.30.5";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1";
sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv";
};
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ];

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "totem-${version}";
version = "3.26.2";
version = "3.30.0";
src = fetchurl {
url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g";
sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0";
};
doCheck = true;

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "vte-${version}";
version = "0.54.2";
version = "0.54.3";
src = fetchurl {
url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj";
sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9";
};
passthru = {

View file

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle;
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -371,8 +371,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnome-games-support = callPackage ./misc/libgnome-games-support { };
libgda = callPackage ./misc/libgda { };
libgit2-glib = callPackage ./misc/libgit2-glib { };
libmediaart = callPackage ./misc/libmediaart { };

View file

@ -5,13 +5,13 @@
let
pname = "gnome-tweaks";
version = "3.30.1";
version = "3.30.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa";
sha256 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z";
};
nativeBuildInputs = [

View file

@ -3,13 +3,13 @@
let
pname = "libgnome-games-support";
version = "1.4.2";
version = "1.4.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088";
sha256 = "0g6a1vvhrbs0pfnzjfg3lgqvppwkydn6j3dn713zhrjhma9pljkh";
};
nativeBuildInputs = [ pkgconfig intltool ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala
, overrideCC, gcc6
, mysqlSupport ? false, mysql ? null
, postgresSupport ? false, postgresql ? null
@ -8,18 +8,13 @@ assert mysqlSupport -> mysql != null;
assert postgresSupport -> postgresql != null;
(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
name = "libgda-${version}";
version = "5.2.5";
pname = "libgda";
version = "5.2.8";
src = fetchurl {
url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1j4hxhiwr4i8rgbn2ck93y1c2b792sfzlrq7abyjx8h8ik1f9lp3";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; };
};
configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ]
++ (optional (mysqlSupport) "--with-mysql=yes")
++ (optional (postgresSupport) "--with-postgres=yes");
@ -28,11 +23,17 @@ assert postgresSupport -> postgresql != null;
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ];
buildInputs = with stdenv.lib; [ gtk3 openssl ]
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ];
buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
++ optional (mysqlSupport) mysql.connector-c
++ optional (postgresSupport) postgresql;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "Database access library";
homepage = http://www.gnome-db.org/;

View file

@ -10766,6 +10766,8 @@ in
});
libgap = callPackage ../development/libraries/libgap { };
libgda = callPackage ../development/libraries/libgda { };
libgdata = gnome3.libgdata;
libgig = callPackage ../development/libraries/libgig { };