diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/desktops | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/deepin-gtk-theme/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-software/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/mate/mate-screensaver/default.nix | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 26520889c7de..a36a96771904 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.6"; + version = "17.10.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll"; + sha256 = "1z5f5dnda18gixkjcxpvsavhv9m5l2kq61958fdfm1idi0cbr7fp"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 81d401f8da2e..6172f2165439 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree -, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak +, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak, fwupd , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -27,12 +27,11 @@ stdenv.mkDerivation rec { gnome3.gtk glib packagekit appstream-glib libsoup gnome3.gsettings-desktop-schemas gnome3.gnome-desktop gspell json-glib libsecret ostree - polkit flatpak + polkit flatpak fwupd ]; mesonFlags = [ "-Denable-rpm=false" - "-Denable-fwupd=false" "-Denable-oauth=false" "-Denable-ubuntu-reviews=false" "-Denable-gudev=false" diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index b4ace8cc9252..b4c215339b55 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1mcr2915wymwjy55m2z0l6b9dszabbv0my0xxsa1fb8xkr4hk4qh"; + sha256 = "1asfw2x0ha830ilkw97bjdqm2gnjbpb6dd7lb6h43aix7g3lgm7f"; }; nativeBuildInputs = [ |