Skip to content

Commit

Permalink
Merge pull request #40155 from jtojnar/gnome-3.28.2
Browse files Browse the repository at this point in the history 
GNOME Updates
  • Loading branch information
@jtojnar
jtojnar committed May 8, 2018
2 parents 78b4b90 + fd0d1f3 commit 85a0cd9
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/meld/default.nix
View file
Expand Up @@ -5,14 +5,14 @@

let
pname = "meld";
version = "3.18.0";
version = "3.18.1";
inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis";
};

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/bijiben/default.nix
View file
Expand Up @@ -5,13 +5,13 @@
, gnome3, libxml2 }:

let
version = "3.28.1";
version = "3.28.2";
in stdenv.mkDerivation rec {
name = "bijiben-${version}";

src = fetchurl {
url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17";
sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs";
};

doCheck = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/evolution/default.nix
View file
Expand Up @@ -5,13 +5,13 @@
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:

let
version = "3.28.1";
version = "3.28.2";
in stdenv.mkDerivation rec {
name = "evolution-${version}";

src = fetchurl {
url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l";
sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74";
};

propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View file
Expand Up @@ -9,13 +9,13 @@
# TODO: ovirt (optional)

let
version = "3.28.2";
version = "3.28.3";
in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";

src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1";
sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
};

doCheck = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
View file
Expand Up @@ -4,13 +4,13 @@

let
pname = "gnome-calendar";
version = "3.28.1";
version = "3.28.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6";
sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw";
};

passthru = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
View file
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "gnome-characters-${version}";
version = "3.28.0";
version = "3.28.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0";
sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0";
};

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
View file
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "gnome-logs-${version}";
version = "3.28.0";
version = "3.28.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b";
sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0";
};

configureFlags = [ "--disable-tests" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View file
Expand Up @@ -5,13 +5,13 @@

let
pname = "gnome-maps";
version = "3.28.1";
version = "3.28.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5";
sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7";
};

doCheck = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View file
Expand Up @@ -6,13 +6,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
version = "3.28.1";
version = "3.28.2";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx";
sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
};

nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/eog/default.nix
View file
Expand Up @@ -4,13 +4,13 @@

let
pname = "eog";
version = "3.28.1";
version = "3.28.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq";
sha256 = "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View file
Expand Up @@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
version = "3.28.1";
version = "3.28.2";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b";
sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gjs/default.nix
View file
Expand Up @@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "gjs-${version}";
version = "1.52.2";
version = "1.52.3";

src = fetchurl {
url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98";
sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff";
};

passthru = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View file
Expand Up @@ -5,13 +5,13 @@
, vala, meson, ninja }:

let
version = "3.28.1";
version = "3.28.2";
in stdenv.mkDerivation rec {
name = "gnome-contacts-${version}";

src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi";
sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w";
};

propagatedUserEnvPkgs = [ evolution-data-server ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View file
Expand Up @@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "gnome-keyring-${version}";
version = "3.28.0.2";
version = "3.28.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8";
sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
};

passthru = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
View file
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "gnome-shell-extensions-${version}";
version = "3.28.0";
version = "3.28.1";

src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91";
sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9";
};

passthru = {
Expand Down Expand Up @@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
# Fixup adapted from export-zips.sh in the source.
extensiondir=$out/share/gnome-shell/extensions
schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/
schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/
glib-compile-schemas $schemadir
Expand Down
8 changes: 4 additions & 4 deletions pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View file
@@ -1,7 +1,7 @@
{ fetchurl, fetchpatch, substituteAll, 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, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
, sassc, systemd, gst_all_1 }:
Expand All @@ -13,11 +13,11 @@ let

in stdenv.mkDerivation rec {
name = "gnome-shell-${version}";
version = "3.28.0";
version = "3.28.1";

src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7";
sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35";
};

# Needed to find /etc/NetworkManager/VPN
Expand All @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {

nativeBuildInputs = [
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
sassc
sassc desktop-file-utils
];
buildInputs = with gnome3; [
systemd caribou
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Expand Up @@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "mutter-${version}";
version = "3.28.0";
version = "3.28.1";

src = fetchurl {
url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq";
sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin";
};

passthru = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gvfs/default.nix
View file
Expand Up @@ -18,14 +18,14 @@

let
pname = "gvfs";
version = "1.36.1";
version = "1.36.2";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q";
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
};

# Uncomment when switching back to meson
Expand Down

0 comments on commit 85a0cd9

Please sign in to comment.