Merge pull request #24397 from romildo/upd.mate

mate: update packages to version 1.18.0
This commit is contained in:
Joachim F 2017-03-30 13:29:47 +01:00 committed by GitHub
commit 17132839c1
8 changed files with 87 additions and 45 deletions

View file

@ -0,0 +1,38 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "caja-${version}";
version = "${major-ver}.${minor-ver}";
major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606";
};
nativeBuildInputs = [
pkgconfig
intltool
wrapGAppsHook
];
buildInputs = [
gtk3
libnotify
libxml2
libexif
exempi
mate.mate-desktop
];
configureFlags = [ "--disable-update-mimedb" ];
meta = {
description = "File manager for the MATE desktop";
homepage = "http://mate-desktop.org";
license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}

View file

@ -1,5 +1,6 @@
{ callPackage, pkgs }: { callPackage, pkgs }:
rec { rec {
caja = callPackage ./caja { };
mate-common = callPackage ./mate-common { }; mate-common = callPackage ./mate-common { };
mate-desktop = callPackage ./mate-desktop { }; mate-desktop = callPackage ./mate-desktop { };
mate-icon-theme = callPackage ./mate-icon-theme { }; mate-icon-theme = callPackage ./mate-icon-theme { };

View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-common-${version}"; name = "mate-common-${version}";
version = "${major-ver}.${minor-ver}"; version = "${major-ver}.${minor-ver}";
major-ver = "1.17"; major-ver = "1.18";
minor-ver = "0"; minor-ver = "0";
src = fetchurl { src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc"; sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p";
}; };
meta = { meta = {

View file

@ -1,33 +1,36 @@
{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-desktop-${version}"; name = "mate-desktop-${version}";
version = "${major-ver}.${minor-ver}"; version = "${major-ver}.${minor-ver}";
major-ver = "1.17"; major-ver = "1.18";
minor-ver = "2"; minor-ver = "0";
src = fetchurl { src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g"; sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
}; };
propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [
gnome3.gnome_themes_standard
buildInputs = with pkgs; [
intltool
pkgconfig
gnome3.dconf
gnome3.gtk
gnome3.defaultIconTheme
]; ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [
gnome3.dconf
gnome3.gtk
gnome3.defaultIconTheme
];
nativeBuildInputs = [
pkgconfig
intltool
wrapGAppsHook
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library with common API for various MATE modules"; description = "Library with common API for various MATE modules";
homepage = "http://mate-desktop.org"; homepage = "http://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-icon-theme-faenza-${version}"; name = "mate-icon-theme-faenza-${version}";
version = "${major-ver}.${minor-ver}"; version = "${major-ver}.${minor-ver}";
major-ver = "1.16"; major-ver = "1.18";
minor-ver = "0"; minor-ver = "0";
src = fetchurl { src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg"; sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-icon-theme-${version}"; name = "mate-icon-theme-${version}";
version = "${major-ver}.${minor-ver}"; version = "${major-ver}.${minor-ver}";
major-ver = "1.17"; major-ver = "1.18";
minor-ver = "0"; minor-ver = "0";
src = fetchurl { src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n"; sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i";
}; };
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

View file

@ -1,19 +1,17 @@
{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mate-terminal-${version}"; name = "mate-terminal-${version}";
version = "${major-ver}.${minor-ver}"; version = "${major-ver}.${minor-ver}";
major-ver = "1.17"; major-ver = "1.18";
minor-ver = "0"; minor-ver = "0";
src = fetchurl { src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f"; sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92";
}; };
buildInputs = with pkgs; [ buildInputs = [
intltool
pkgconfig
glib glib
itstool itstool
libxml2 libxml2
@ -25,12 +23,16 @@ stdenv.mkDerivation rec {
gnome3.dconf gnome3.dconf
]; ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [
pkgconfig
intltool
wrapGAppsHook
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE Terminal Emulator"; description = "The MATE Terminal Emulator";
homepage = "http://mate-desktop.org"; homepage = "http://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -6,17 +6,15 @@ stdenv.mkDerivation rec {
version = "${major-ver}.${minor-ver}"; version = "${major-ver}.${minor-ver}";
major-ver = gnome3.version; major-ver = gnome3.version;
minor-ver = { minor-ver = {
"3.18" = "4"; "3.20" = "16";
"3.20" = "12"; "3.22" = "7";
"3.22" = "3";
}."${major-ver}"; }."${major-ver}";
src = fetchurl { src = fetchurl {
url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
sha256 = { sha256 = {
"3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b"; "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v";
"3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca"; "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0";
"3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k";
}."${major-ver}"; }."${major-ver}";
}; };