From d466d9062373ae3a9a9d393b6f84f75099de05b6 Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 27 Mar 2017 23:22:00 -0300 Subject: [PATCH 1/7] mate-common: 1.17.0 -> 1.18.0 --- pkgs/desktops/mate/mate-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index b020351afe2..7bd7a3f2770 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.17"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc"; + sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p"; }; meta = { From a5c34e5689ce3510d79299a67fb4bc8d4a532d7c Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 27 Mar 2017 23:22:40 -0300 Subject: [PATCH 2/7] mate-icon-theme: 1.17.0 -> 1.18.0 --- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index ab699c78c0e..e41a1c21710 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.17"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n"; + sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; From 23f373d7249e8370229f184ad3d40b586d2254d2 Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 27 Mar 2017 23:23:30 -0300 Subject: [PATCH 3/7] mate-icon-theme-faenza: 1.16.0 -> 1.18.0 --- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index d9370f318d7..3d820553b4a 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.16"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg"; + sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v"; }; nativeBuildInputs = [ autoreconfHook ]; From 55acc8708b920cd6d827b95660425b03f362d71d Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 27 Mar 2017 23:25:11 -0300 Subject: [PATCH 4/7] mate-themes: 3.22.3 -> 3.22.7 --- pkgs/desktops/mate/mate-themes/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 343148da0bc..cf78009708b 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,17 +6,15 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.18" = "4"; - "3.20" = "12"; - "3.22" = "3"; + "3.20" = "16"; + "3.22" = "7"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b"; - "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca"; - "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k"; + "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v"; + "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0"; }."${major-ver}"; }; From 8844d9b8667a01392cc421e77ae8353a886dc1f3 Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 27 Mar 2017 23:25:49 -0300 Subject: [PATCH 5/7] mate-desktop: 1.17.2 -> 1.18.0 --- pkgs/desktops/mate/mate-desktop/default.nix | 43 +++++++++++---------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index fcb66c9ad79..2afd700d933 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-desktop-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; - minor-ver = "2"; + name = "mate-desktop-${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 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g"; + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg"; }; - propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ]; - - buildInputs = with pkgs; [ - intltool - pkgconfig - - gnome3.dconf - gnome3.gtk - gnome3.defaultIconTheme + propagatedUserEnvPkgs = [ + gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + gnome3.dconf + gnome3.gtk + gnome3.defaultIconTheme + ]; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = "http://mate-desktop.org"; - license = licenses.gpl2; - platforms = platforms.unix; + homepage = "http://mate-desktop.org"; + license = licenses.gpl2; + platforms = platforms.unix; }; } From d9672293c2681ee867cc9288b68b91c4fa2efc05 Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 27 Mar 2017 23:26:24 -0300 Subject: [PATCH 6/7] mate-terminal: 1.17.0 -> 1.18.0 --- pkgs/desktops/mate/mate-terminal/default.nix | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index dd380f39477..fd907c56280 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-terminal-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; + name = "mate-terminal-${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 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f"; + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92"; }; - buildInputs = with pkgs; [ - intltool - pkgconfig + buildInputs = [ glib itstool libxml2 @@ -25,12 +23,16 @@ stdenv.mkDerivation rec { gnome3.dconf ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = "http://mate-desktop.org"; - license = licenses.gpl3; - platforms = platforms.unix; + homepage = "http://mate-desktop.org"; + license = licenses.gpl3; + platforms = platforms.unix; }; } From 7bc9e508ba704918165c3c8ea2e6cbd011b4d530 Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 28 Mar 2017 08:44:28 -0300 Subject: [PATCH 7/7] caja: init at 1.18.0 --- pkgs/desktops/mate/caja/default.nix | 38 +++++++++++++++++++++++++++++ pkgs/desktops/mate/default.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/desktops/mate/caja/default.nix diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix new file mode 100644 index 00000000000..aea006fc486 --- /dev/null +++ b/pkgs/desktops/mate/caja/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 4d662cf52a9..d9565e8f4d1 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,5 +1,6 @@ { callPackage, pkgs }: rec { + caja = callPackage ./caja { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { };