diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 12:25:43 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 12:25:43 +0200 |
| commit | 19c68fe28c10e6223506dd1baec609dcea0b4b5c (patch) | |
| tree | 27cd7fcfecd92b95da661b013698f87b0c6ae412 /pkgs/desktops | |
| parent | d28ce159f6adb6794cf25773d90623e850abca2f (diff) | |
| parent | e6a37e3ce4eb7ab711bae565c84e7a9900e8963f (diff) | |
| download | nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.tar nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.tar.gz nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.tar.bz2 nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.tar.lz nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.tar.xz nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.tar.zst nixpkgs-19c68fe28c10e6223506dd1baec609dcea0b4b5c.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/california/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/mate/eom/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index 91aeb7ca00a..7c90d8fa4e4 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobjectIntrospection , gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ]; + nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index ee297237f6e..4f338051449 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eom-${version}"; - version = "1.21.0"; + version = "1.21.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "165n314hxapq8glzlv7vs5x44z13wjmpysl5p7q3ckrsxy5pczww"; + sha256 = "08idw219mw0v0nkaphy0jvxi67gqm4nzbbnhnwjksxbma2gmpvss"; }; nativeBuildInputs = [ |