mate: remove major-ver and minor-ver

Keep only the version atribute in derivations, with the full version
string of the package. This will make it easier to write a script for
automatic updating of the packages using the update-source-version
command from common-updater-scripts.

1 files changed, 4 insertions, 6 deletions

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index f15a78120cb..52b391317c8 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd,
-  libSM, libXtst, gtk3, mate-desktop, hicolor_icon_theme,
+  libSM, libXtst, gtk3, hicolor_icon_theme, mate,
   wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
-  version = "${major-ver}.${minor-ver}";
-  major-ver = "1.18";
-  minor-ver = "2";
+  version = "1.18.2";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
     sha256 = "11ii7azl8rn9mfymcmcbpysyd12vrxp4s8l3l6yk4mwlr3gvzxj0";
   };
 
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
     libSM
     libXtst
     gtk3
-    mate-desktop
+    mate.mate-desktop
     hicolor_icon_theme
   ];