diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 2f95043097d..ada4fb7a394 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-common-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.14"; + major-ver = "1.15"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1xkcwn3w6vrgnkcw7mcvihrsqclpkbqqxs1ivj4cq0dkqrm1kdq4"; + sha256 = "1r3c0i03ylrlibn4pz4j9qzbnj7b540hyhf98kkzzh680jn59iiy"; }; meta = { diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 941b730d754..ea441f0cc09 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.14"; + major-ver = "1.15"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "115rbw4rbk8jqbjpbh5bfqjzsbwj5723r6cw96b1xrq1dv4gy4nr"; + sha256 = "0ypk61sjgqj0b1sina9947x1dg456baxhsyybmxrwpgy3pr06qlz"; }; - nativeBuildInputs = [ autoreconfHook mate.mate-common ]; + nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ hicolor_icon_theme ]; + buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ]; meta = { description = "Faenza icon theme from MATE"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index f68c8b403ee..9d4adb331ac 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.14"; + major-ver = "1.15"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1d8y4vlna8higz05mc01srrgspxmzw04vh3hyzcd9ms603njpfqm"; + sha256 = "1jpz3ihmyhyiyqlqz798xgzl3qa31ghymw3yrw6abd7ww0nkwiq9"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index bc622ef3729..1984e2dbdf9 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, gtk_engines, +{ stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { name = "mate-themes-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "3.18"; - minor-ver = "1"; + major-ver = gnome3.version; + minor-ver = { + "3.18" = "2"; + "3.20" = "8"; + }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; - sha256 = "0lkp6jqvnxp6jly35iw89paqs279nvhqg01ig92n1xcfp8yrqq9c"; + sha256 = { + "3.18" = "1yy22nk450wsx0mlsvdalkyj41mijlvy8s6kifh98d4dnk8dvgfj"; + "3.20" = "14jl3mbhzm7k2ilp8nmdwy9wrbmc7mbg2i0arf479xs2h7dz06f6"; + }."${major-ver}"; }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk2 gtk_engines gtk-engine-murrine gdk_pixbuf librsvg ]; + buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine + gdk_pixbuf librsvg ]; meta = { description = "A set of themes from MATE";